Hashir Mohammed [Tue, 9 May 2017 15:56:17 +0000 (11:56 -0400)]
Bug 259 Support port_security in Openmano
Change-Id: Iaf5d8ca75580a0122b6114862c451b243b4e72b9
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
velandy [Mon, 8 May 2017 20:40:28 +0000 (16:40 -0400)]
Turned ip profile refs into leafrefs from string
Change-Id: I8f2e91409e6193e4790253ae34c8dccfe5c3e649
Signed-off-by: velandy <rajesh.velandy@riftio.com>
velandy [Mon, 8 May 2017 17:15:45 +0000 (19:15 +0200)]
Merge "[RIFT 16413, 16414] Unittest failures fixed for utest_package, utest_publisher_dts" into v2.0
Hashir Mohammed [Mon, 8 May 2017 15:36:38 +0000 (11:36 -0400)]
Bug 258 - Bug fix
- NSR delete method was wrongly annotated as a coroutine
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
sinhan [Mon, 8 May 2017 14:41:48 +0000 (14:41 +0000)]
[RIFT 16413, 16414] Unittest failures fixed for utest_package, utest_publisher_dts
Signed-off-by: sinhan <nandan.sinha@riftio.com>
Ravi Chamarty [Fri, 5 May 2017 01:45:27 +0000 (01:45 +0000)]
Bug 261 Fix NSR member vnf index type for NS service primitive
Signed-off-by: Ravi Chamarty <ravi.chamarty@riftio.com>
(cherry picked from commit
8fa3ce93eb414b68b6bab32e00706a655c1ea7a1)
Change-Id: Ibc788f78002984ab64afc49fa21879ff6828f02f
sinhan [Mon, 1 May 2017 20:46:48 +0000 (20:46 +0000)]
RIFT 16087 Strip off any leading slashes from README asset files so that it downloads.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
velandy [Mon, 1 May 2017 16:39:13 +0000 (12:39 -0400)]
Fixed breakage in function proto-types due to scaling changes
Change-Id: I4dc470df259b5de23f152a1e0fec549ce9319721
Signed-off-by: velandy <rajesh.velandy@riftio.com>
velandy [Fri, 28 Apr 2017 21:22:53 +0000 (23:22 +0200)]
Merge "Merge branch 'pm_phase2' into v2.0" into v2.0
velandy [Fri, 28 Apr 2017 21:22:40 +0000 (23:22 +0200)]
Merge "Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type rpc param." into v2.0
sinhan [Thu, 27 Apr 2017 20:31:42 +0000 (20:31 +0000)]
[RIFT 16251] tailf yang change for confd to send the right copy-jobs status.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
sinhan [Wed, 26 Apr 2017 18:42:43 +0000 (18:42 +0000)]
Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type rpc param.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
velandy [Thu, 27 Apr 2017 16:57:37 +0000 (18:57 +0200)]
Merge "enable package builds" into v2.0
sinhan [Wed, 26 Apr 2017 18:42:43 +0000 (18:42 +0000)]
Merge branch 'pm_phase2' into v2.0
Signed-off-by: sinhan <nandan.sinha@riftio.com>
Jeremy Mordkoff [Wed, 26 Apr 2017 21:23:09 +0000 (21:23 +0000)]
enable package builds
Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@RIFTio.com>
prithiv [Wed, 26 Apr 2017 18:52:37 +0000 (19:52 +0100)]
Bug 240 - NS Scaling
Signed-off-by: prithiv <prithiv.mohan@intel.com>
sinhan [Wed, 26 Apr 2017 03:13:29 +0000 (03:13 +0000)]
[RIFT 16087] Backend changes to decouple storage semantics from user interface. Changes affect how packages are exported and their exported conventions.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
Chamarty [Tue, 25 Apr 2017 16:04:08 +0000 (16:04 +0000)]
Bug 197 Remove ping pong images from SO code
Change-Id: I5962e0be718ef6ffc972685ecdcfc6c508304a32
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
velandy [Fri, 21 Apr 2017 19:30:24 +0000 (15:30 -0400)]
Updated RIFT.ware platform from 4.4.0.0.57702 to 4.4.2.0.60195
Change-Id: Idf3e25b5909d6afba38d72906d0d7dffc94fbc5f
Signed-off-by: velandy <rajesh.velandy@riftio.com>
velandy [Tue, 18 Apr 2017 19:21:19 +0000 (21:21 +0200)]
Merge "Fix ordering of elements for Openstack block device mapping"
Anurag Dwivedi [Mon, 17 Apr 2017 07:00:26 +0000 (03:00 -0400)]
RIFT-14692 : Feedback on nsd.yang comments
Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
Chamarty [Fri, 14 Apr 2017 20:11:20 +0000 (16:11 -0400)]
Fix ordering of elements for Openstack block device mapping
Change-Id: I3904241acd6190e86f9dfb56c521d2badaf35904
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
Jithin Jose [Tue, 11 Apr 2017 07:44:37 +0000 (03:44 -0400)]
Clean up openstack network after failed instantiate
Signed-off-by: Jithin Jose <Jithin.Jose@riftio.com>
sinhan [Mon, 10 Apr 2017 21:11:38 +0000 (21:11 +0000)]
[RIFT 16147] Make yang change for not implemented error, also show in-progress for large copy.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
Wesley Hirsch [Mon, 10 Apr 2017 17:18:59 +0000 (13:18 -0400)]
Fix build executor collision issues in Jenkins
Explicitly require that the declarative pipeline master run on a node with the
label pipeline so that the build itself can consume standard resources.
Change-Id: I16b46329fa4430336b884dff4d732d889ab65c73
Signed-off-by: Wesley Hirsch <wesley.hirsch@riftio.com>
Anurag Dwivedi [Mon, 10 Apr 2017 12:56:51 +0000 (08:56 -0400)]
RIFT-16103 : Adding VDU Name field in YAML File.
YAML File generated has vdu name information for manually triggered eventsi
Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
velandy [Fri, 7 Apr 2017 23:51:54 +0000 (01:51 +0200)]
Merge "Implement scaling RPCs using REST rather than netconf"
velandy [Fri, 7 Apr 2017 15:48:43 +0000 (17:48 +0200)]
Merge "Fix connection timeouts in URL downloader"
Chamarty [Fri, 7 Apr 2017 15:37:31 +0000 (11:37 -0400)]
Fix connection timeouts in URL downloader
Change-Id: I269868a69f16c3317cc343c4ec2a7fbe2e6a9387
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
Jithin Jose [Fri, 7 Apr 2017 06:48:57 +0000 (02:48 -0400)]
Implement scaling RPCs using REST rather than netconf
Signed-off-by: Jithin Jose <Jithin.Jose@riftio.com>
velandy [Thu, 6 Apr 2017 21:52:15 +0000 (23:52 +0200)]
Merge "Bug 117"
sinhan [Wed, 5 Apr 2017 22:27:34 +0000 (22:27 +0000)]
[Bug 244] For nested directories, extract the basename to get the filename after the nested directory path is created.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
Change-Id: I3cb134403d6dff954ce0ff1517f286a7310edd56
Hashir Mohammed [Wed, 5 Apr 2017 11:00:10 +0000 (07:00 -0400)]
Bug 117
* Bug Fix | SO does not send request for deletion to the RO when trying to delete from the UI
* More expressive log
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
Anurag Dwivedi [Thu, 6 Apr 2017 13:14:04 +0000 (09:14 -0400)]
Additional Commit for RIFT-14719 : Adding descriptions for leaf overlay type
Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
Anurag Dwivedi [Thu, 6 Apr 2017 12:54:57 +0000 (08:54 -0400)]
RIFT-16103 : VNFD VDU name is not passed as is in the config YAML input anymore
Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
Chamarty [Wed, 5 Apr 2017 14:13:09 +0000 (10:13 -0400)]
CAL and SDNAL cleanup for failure cases in accounts
Change-Id: Icf7e139608e04f26c0c04f636916d0a775061c8e
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
Chamarty [Mon, 3 Apr 2017 21:26:43 +0000 (17:26 -0400)]
SDN Accounts refactoring
Change-Id: I1e9d8f744dab71a8b4967158f7c086e9731938ac
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
velandy [Mon, 3 Apr 2017 11:46:21 +0000 (13:46 +0200)]
Merge "RIFT-14707 : Feedback on vnfd.yang comments"
velandy [Mon, 3 Apr 2017 11:43:16 +0000 (13:43 +0200)]
Merge "RIFT-14719 : mano-types.yang Feedback and Comments"
Anurag Dwivedi [Mon, 3 Apr 2017 10:59:37 +0000 (06:59 -0400)]
RIFT-14707 : Feedback on vnfd.yang comments
(i) Typos and Grammatical Errors.
(ii) Global revision of short-name across all yang-files
("Short name to appear as label in the UI")
Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
Jithin Jose [Mon, 3 Apr 2017 10:32:58 +0000 (10:32 +0000)]
Set VCPUs and RAM for the VNFC irrespective of Numa Node Policy of the Guest EPA
Signed-off-by: Jithin Jose <jithin.jose@riftio.com>
Anurag Dwivedi [Mon, 3 Apr 2017 09:43:24 +0000 (05:43 -0400)]
RIFT-14719 : mano-types.yang Feedback and Comments
(i) Typos and Grammatical Feedback.
(ii) Improved Descriptions.
Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
sinhan [Fri, 31 Mar 2017 19:08:59 +0000 (19:08 +0000)]
RIFT 15576 Support for copying descriptors with assets, with new rpc and yang data model.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
velandy [Fri, 31 Mar 2017 18:17:31 +0000 (20:17 +0200)]
Merge "Fix SO to RO translation for volumes"
Chamarty [Fri, 31 Mar 2017 16:11:17 +0000 (16:11 +0000)]
Fix SO to RO translation for volumes
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
velandy [Fri, 31 Mar 2017 15:35:50 +0000 (17:35 +0200)]
Merge "Revert " Removed unused scaling rpc handler code""
chamarty [Fri, 31 Mar 2017 15:29:48 +0000 (16:29 +0100)]
Revert " Removed unused scaling rpc handler code"
This reverts commit
5f2bf0fbc7e2d7560bd81bb7c671bc7cfcda5745.
Change-Id: I1386c6289f0a0214fde0417674de7dfa1e85f92c
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
Adam Israel [Fri, 31 Mar 2017 01:39:26 +0000 (21:39 -0400)]
Import of core OSM charm layers
Signed-off-by: Adam Israel <adam.israel@canonical.com>
Change-Id: Iff2c30e3b952d52891c190ec2d7a31a650e5ad53
Anurag Dwivedi [Thu, 30 Mar 2017 13:03:25 +0000 (09:03 -0400)]
Detailed logs on Onboarding Failure
Event Logs now display the failed upload job with the
image and account information.
Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
Philip Joseph [Tue, 28 Mar 2017 18:22:19 +0000 (23:52 +0530)]
Bug 219 : Improve error handling
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
Chamarty [Thu, 23 Mar 2017 15:29:34 +0000 (11:29 -0400)]
Fix DTS updates in package manager publisher
Change-Id: I285bfd3e05d1856f58e2974afead00b47ccac3b2
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
Jithin Jose [Wed, 22 Mar 2017 06:19:57 +0000 (02:19 -0400)]
Removed unused scaling rpc handler code
Signed-off-by: Jithin Jose <Jithin.Jose@riftio.com>
velandy [Tue, 21 Mar 2017 20:28:51 +0000 (21:28 +0100)]
Merge "Change tag based on job status"
velandy [Tue, 21 Mar 2017 20:26:42 +0000 (20:26 +0000)]
Change tag based on job status
Signed-off-by: velandy <rajesh.velandy@riftio.com>
Wesley Hirsch [Fri, 17 Mar 2017 19:50:56 +0000 (15:50 -0400)]
Added Dockerfile and Jenkinsfile
Change-Id: I18622cb6075bedd70156a907f845d4e03a61d815
Signed-off-by: Wesley Hirsch <wesley.hirsch@riftio.com>
Hashir Mohammed [Wed, 8 Mar 2017 06:25:18 +0000 (01:25 -0500)]
* YANG to TOSCA VNFFG Support
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
Hashir Mohammed [Wed, 1 Mar 2017 12:42:47 +0000 (07:42 -0500)]
* YANG to TOSCA translator
* Bug fixes - TOSCA to YANG
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
Hashir Mohammed [Fri, 10 Feb 2017 19:10:47 +0000 (14:10 -0500)]
TOSCA to YANG Translator Initial commit
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
sinhan [Fri, 17 Mar 2017 21:01:02 +0000 (21:01 +0000)]
[15746] Pkgmgr subscriber should not create a folder if the uploader has already created one with the same id, even though the descriptor name and the file name are different.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
Chamarty [Thu, 16 Mar 2017 01:25:57 +0000 (21:25 -0400)]
Fix URLs for unit tests
Change-Id: I8c19dfe6f68c87d8e1f2b52538fe68d3d3a4281f
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
velandy [Wed, 15 Mar 2017 21:43:58 +0000 (22:43 +0100)]
Merge "Fix metadata initialization"
Jeremy Mordkoff [Wed, 15 Mar 2017 21:25:09 +0000 (21:25 +0000)]
merge from v1.1
Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Jeremy Mordkoff [Wed, 15 Mar 2017 21:23:22 +0000 (21:23 +0000)]
Bug-144 -- set the URL for loganalyzer
Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Chamarty [Wed, 15 Mar 2017 21:20:39 +0000 (17:20 -0400)]
Fix metadata initialization
Change-Id: Icf5279e716433994308de3044422fd9a8c2bcd3d
Signed-off-by: Chamarty <ravi.chamarty@riftio.com>
chamarty [Wed, 15 Mar 2017 18:13:08 +0000 (14:13 -0400)]
Misc CAL fixes
1. Regression in volume device type/bus checks
2. Handle model diffs in volume
3. Handle 'None' assignment to VDU params
Change-Id: Ia7c36cc583018d986b9bced49d5cf596b58ce94e
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
chamarty [Tue, 14 Mar 2017 21:53:45 +0000 (21:53 +0000)]
Fix access to openstack if cinder is not present
Change-Id: I20b32565c39a5ffaea29bf508e93e62af71197ab
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
chamarty [Tue, 14 Mar 2017 16:37:08 +0000 (16:37 +0000)]
Minor fixes to volumes
Change-Id: Ic517ef7b58823001e26d6adc748ee0616d540b6c
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
chamarty [Mon, 13 Mar 2017 20:12:39 +0000 (20:12 +0000)]
Volume ref support
Change-Id: I52c328564fa9eb2d5d95049f033ba5c6c2af19a5
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
Jeremy Mordkoff [Mon, 13 Mar 2017 18:50:42 +0000 (14:50 -0400)]
backport platform install fix from master
chamarty [Mon, 13 Mar 2017 18:28:18 +0000 (18:28 +0000)]
Shorten VDU names
Change-Id: Ibad9e8abcb1deaf149f4990525518ae5df598ac8
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
velandy [Mon, 13 Mar 2017 15:35:35 +0000 (16:35 +0100)]
Merge "Commit to master [RIFT 15737] Remove logic for deletion of folder on deletion of descriptor catalog in UI. Protect against a null catalog name that comes when a field in catalog is updated."
chamarty [Mon, 13 Mar 2017 14:34:49 +0000 (14:34 +0000)]
Cal refactor sync - Ver3
Change-Id: Id0abd4f58e321c3cf8416a5e2d76fa9677a1df8a
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
chamarty [Mon, 13 Mar 2017 14:32:49 +0000 (14:32 +0000)]
Cal refactor sync - Ver3
Change-Id: Ib9464cbbce79b837938b0139321f5bc6dbdd9878
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
sinhan [Fri, 10 Mar 2017 22:14:44 +0000 (22:14 +0000)]
Commit to master [RIFT 15737] Remove logic for deletion of folder on deletion of descriptor catalog in UI. Protect against a null catalog name that comes when a field in catalog is updated.
Signed-off-by: sinhan <nandan.sinha@riftio.com>
velandy [Fri, 10 Mar 2017 19:55:56 +0000 (19:55 +0000)]
Merge branch 'v1.1'
velandy [Fri, 10 Mar 2017 19:54:23 +0000 (20:54 +0100)]
Merge "Revert "Create folder structure in backend for onboarded descriptor - RIFT 15317"" into v1.1
velandy [Fri, 10 Mar 2017 19:50:52 +0000 (20:50 +0100)]
Revert "Create folder structure in backend for onboarded descriptor - RIFT 15317"
This reverts commit
8b17d18c5c0c1efb4b4f0eea2f8ad9b4c438780d.
Change-Id: I6da6ca9ea4d5d0965ce72be9fe215a28b6986c21
Hashir Mohammed [Fri, 10 Mar 2017 11:54:19 +0000 (06:54 -0500)]
CAL refactor- Bug fix
Reviewer: Anirudha
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
Philip Joseph [Thu, 9 Mar 2017 10:22:31 +0000 (10:22 +0000)]
Bug 226 : Error instantiating NS
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
Jeremy Mordkoff [Thu, 9 Mar 2017 02:15:34 +0000 (21:15 -0500)]
mark one package as obsolete
Signed-off-by: Jeremy Mordkoff <jeremy.mordkoff@gmail.com>
Jeremy Mordkoff [Wed, 8 Mar 2017 21:20:25 +0000 (16:20 -0500)]
upgrade platform
Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Leslie Giles [Fri, 24 Feb 2017 18:50:20 +0000 (13:50 -0500)]
One more CAL refactor change
Signed-off-by: Leslie Giles <Leslie.Giles@riftio.com>
Leslie Giles [Fri, 24 Feb 2017 18:10:55 +0000 (13:10 -0500)]
CAL refactoring
Signed-off-by: Leslie Giles <Leslie.Giles@riftio.com>
chamarty [Mon, 6 Mar 2017 17:04:20 +0000 (17:04 +0000)]
Fix unit test for URL downloader - Increase size
Change-Id: I47be6ec88e54728da53a67bc8023f572489d35c0
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
chamarty [Mon, 6 Mar 2017 14:56:25 +0000 (14:56 +0000)]
Add more debug to unit tests
Change-Id: I0edc2fd2f8a75308477f4e70b6fb44dbf6790c00
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
chamarty [Sat, 4 Mar 2017 01:24:30 +0000 (01:24 +0000)]
Fix yaml file content for initial vnf/ns configuration
Change-Id: Ieb3ce01d602bbfcbda2516c1f6736fab473a5b28
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
velandy [Fri, 3 Mar 2017 21:03:00 +0000 (22:03 +0100)]
Merge changes Ic4fa9f76,I66b41f8c
* changes:
Change some strings to leafrefs in NSD model
Remove extraneous element internal-connection-point
velandy [Fri, 3 Mar 2017 21:00:27 +0000 (22:00 +0100)]
Merge "String conversion bug fix" into v1.1
Jeremy Mordkoff [Fri, 3 Mar 2017 16:37:51 +0000 (11:37 -0500)]
uninstall RIFT packages before installing new ones so that if the list of packages changes, the upgrade will work
Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
chamarty [Fri, 3 Mar 2017 15:18:29 +0000 (15:18 +0000)]
Change some strings to leafrefs in NSD model
Had to rearrange some groupings as the leafref targets were not available in NSR yang model
Change-Id: Ic4fa9f76d0196e67756475e00207e8779e6b783a
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
Hashir Mohammed [Fri, 3 Mar 2017 15:16:32 +0000 (10:16 -0500)]
String conversion bug fix
Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>
sinhan [Thu, 2 Mar 2017 19:33:34 +0000 (19:33 +0000)]
Create folder structure in backend for onboarded descriptor - RIFT 15317
Signed-off-by: sinhan <nandan.sinha@riftio.com>
chamarty [Thu, 2 Mar 2017 18:24:53 +0000 (18:24 +0000)]
Remove extraneous element internal-connection-point
Change-Id: I66b41f8c90fd1cfbdad95354c7b9a22742a9946e
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
chamarty [Tue, 28 Feb 2017 14:49:36 +0000 (14:49 +0000)]
Create VL with appropriate type after launchpad restart
Change-Id: I925b14ff01364a6b8c60a69a6d907df8f4ab5161
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
velandy [Mon, 27 Feb 2017 20:02:31 +0000 (20:02 +0000)]
Merge branch 'v1.1'
Signed-off-by: velandy <rajesh.velandy@riftio.com>
velandy [Mon, 27 Feb 2017 20:00:37 +0000 (20:00 +0000)]
Bug 210 - Disable NFVI metrics
Signed-off-by: velandy <rajesh.velandy@riftio.com>
velandy [Mon, 27 Feb 2017 19:51:04 +0000 (20:51 +0100)]
Merge "Bug 210 - Disable NFVI metrics"
velandy [Mon, 27 Feb 2017 19:48:37 +0000 (19:48 +0000)]
Bug 210 - Disable NFVI metrics
Signed-off-by: velandy <rajesh.velandy@riftio.com>
velandy [Mon, 13 Feb 2017 17:05:28 +0000 (18:05 +0100)]
Merge "Support for cfg-file translation to openmano" into v1.1
velandy [Fri, 10 Feb 2017 22:30:47 +0000 (22:30 +0000)]
Merge branch 'v1.1'
projects / osm / SO.git / log