diff options
| author | Prashanth Pai <ppai@redhat.com> | 2014-03-12 16:54:30 +0530 |
|---|---|---|
| committer | Luis Pabon <lpabon@redhat.com> | 2014-03-13 05:09:19 -0700 |
| commit | 2ccd2c4d969cdd6e7feedd21ac2e5cb8498ff37d (patch) | |
| tree | 1886732cf56e26ab836f9fd67c853eff2005fbeb /doc | |
| parent | 1a6b55714fddf7a1b526a31ee3f27589f01e98e5 (diff) | |
Sync with OpenStack Swift v1.13.0
Also, bumped version of gluster-swift to v1.13.0
Change-Id: I797dc704c9523540cba847b1e8ff3da97b79630c
Signed-off-by: Prashanth Pai <ppai@redhat.com>
Reviewed-on: http://review.gluster.org/7229
Reviewed-by: Chetan Risbud <crisbud@redhat.com>
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/markdown/openstack_swift_sync.md | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/markdown/openstack_swift_sync.md b/doc/markdown/openstack_swift_sync.md index f3feac8..ba2fadb 100644 --- a/doc/markdown/openstack_swift_sync.md +++ b/doc/markdown/openstack_swift_sync.md @@ -14,7 +14,8 @@ $ python setup.py sdist $ ls dist ``` -* Take the file in the `dist` directory and upload it to the new release we created it on launchpad.net +* Take the file in the `dist` directory and upload it to the new release we created it on launchpad.net. +* Alternatively, if we are syncing with a Swift version which is already released, we can get the tar.gz file from Swift launchpad page and upload the same to gluster-swift launchpad. ## Setup Tox Now that the swift source is availabe on launchpad.net, copy its link location and update tox.ini in gluster-swift with the new link. @@ -22,7 +23,11 @@ Now that the swift source is availabe on launchpad.net, copy its link location a ## Update tests This part is a little more complicated and now we need to *merge* the latest tests with ours. -I suggest using a tool called `meld` to make this work easier. +[meld](http://meldmerge.org/) is a great tool to make this work easier. The 3-way comparison feature of meld comes handy to compare 3 version of same file from: + +* Latest swift (say v1.13) +* Previous swift (say v1.12) +* gluster-swift (v1.12) Files that need to be merged: |