Skip to content

Commit ddbe2eb

Browse files
committed
Clean-up regarding "2.5.1.1" and prep for 2.5.1.2
2.5.1.1 was originally an internal release which was eventually created differently. We are now using "2.5.1.1" to refer to the cumulative roll-up of 2.5.1 hotfixes. As such, this commit deletes the (stale, unused) rel- and override- manifests for 2.5.1.1, and adds an "official" released/2.5.1.1.xml manifest reflecting what was actually shipped. Finally, this updates rel-2.5.1.xml to reference the upcoming 2.5.1.2 build. Change-Id: I84cba4fdecb5698793bcfc0f6e7115deeed8d168 Reviewed-on: http://review.couchbase.org/42189 Reviewed-by: Dave Finlay <[email protected]> Reviewed-by: Chris Hillery <[email protected]> Tested-by: Chris Hillery <[email protected]>
1 parent 01754b7 commit ddbe2eb

File tree

5 files changed

+51
-60
lines changed

5 files changed

+51
-60
lines changed

external-override-2.5.1.1.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

override-2.5.1.1.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

rel-2.5.1.1.xml

Lines changed: 0 additions & 31 deletions
This file was deleted.

rel-2.5.1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<project name="libvbucket" path="libvbucket" revision="408057ec55da3862ab8d75b1ed25d2848afd640f" />
2525
<project name="memcached" path="memcached" revision="349f670f51a36a795bd7016baac3b18408e8d2c5" remote="membase" />
2626
<project name="moxi" path="moxi" revision="2b5a228f58fcfd1a836d6ad9a8f279b4f0ebfe80" />
27-
<project name="ns_server" path="ns_server" revision="2.5.1.1" />
27+
<project name="ns_server" path="ns_server" revision="rel-2.5.1.1" />
2828
<project name="portsigar" path="portsigar" revision="2204847c85a3ccaecb2bb300306baf64824b2597" />
2929
<project name="sigar" path="sigar" revision="a402af5b6a30ea8e5e7220818208e2601cb6caba" />
3030
<project name="testrunner" path="testrunner" revision="67b9b374b552312b6addf3fd4a3c17891450eb7b" />

released/2.5.1.1.xml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<manifest>
3+
<remote name="couchbase" fetch="git://github.com/couchbase/"/>
4+
<remote name="membase" fetch="git://github.com/membase/"/>
5+
<remote name="apache" fetch="git://github.com/apache/"/>
6+
<remote name="erlang" fetch="git://github.com/erlang/"/>
7+
8+
<default remote="couchbase" revision="master"/>
9+
10+
<project name="tlm" path="tlm" revision="db49bf5d4e601c5994f8bd7f61ca6cff6840af5d">
11+
<copyfile src='Makefile.top' dest='Makefile'/>
12+
</project>
13+
<project name="bucket_engine" path="bucket_engine" revision="0a3a9df0a55d759b5b78a3a7d001a97a4d35af1c"/>
14+
<project name="cbsasl" path="cbsasl" revision="578523010d4efaa9fed1a32880c67bfb03c20728"/>
15+
<project name="couchbase-cli" path="couchbase-cli" revision="2d3b8a2c6c6c5cc47ef09c2ea5d1b382b00245a8"
16+
remote="couchbase"/>
17+
<project name="couchbase-examples" path="couchbase-examples" revision="1fb1d2929eaa974144147cc6a6da4735fc97d512"/>
18+
<project name="couchbase-python-client" path="couchbase-python-client" revision="f14c0f53b633b5313eca1ef64b0f241330cf02c4"/>
19+
<project name="couchdb" path="couchdb" revision="a28dcfa850f212b0e06aed8a137e6875000b90ac"/>
20+
<project name="couchdbx-app" path="couchdbx-app" revision="4fc62283ac16580130de47c1ec821b30b5efa54b"/>
21+
<project name="couchstore" path="couchstore" revision="de0dcdc292935b93c4700386c5f65c92daff7039"/>
22+
<project name="ep-engine" path="ep-engine" revision="78c46a5ba223000ec6f97159650ee39fb73683af"/>
23+
<project name="geocouch" path="geocouch" revision="000096996e57b2193ea8dde87e078e653a7d7b80"/>
24+
<project name="healthchecker" path="healthchecker" revision="674de488b308eb6e065fd6cd9e115fabfb7e92ed"/>
25+
<project name="libconflate" path="libconflate" revision="c0d3e26a51f25a2b020713559cb344d43ce0b06c"/>
26+
<project name="libmemcached" path="libmemcached" revision="ea579a523ca3af872c292b1e33d800e3649a8892"
27+
remote="membase"/>
28+
<project name="libvbucket" path="libvbucket" revision="408057ec55da3862ab8d75b1ed25d2848afd640f"/>
29+
<project name="memcached" path="memcached" revision="349f670f51a36a795bd7016baac3b18408e8d2c5"
30+
remote="membase"/>
31+
<project name="moxi" path="moxi" revision="2b5a228f58fcfd1a836d6ad9a8f279b4f0ebfe80"/>
32+
<project name="ns_server" path="ns_server" revision="127b662482968fe68bb74ca5ec8245f3a18639e3"/>
33+
<project name="portsigar" path="portsigar" revision="2204847c85a3ccaecb2bb300306baf64824b2597"/>
34+
<project name="sigar" path="sigar" revision="a402af5b6a30ea8e5e7220818208e2601cb6caba"/>
35+
<project name="testrunner" path="testrunner" revision="67b9b374b552312b6addf3fd4a3c17891450eb7b"/>
36+
<project name="otp" path="otp" revision="b6dc1a844eab061d0a7153d46e7e68296f15a504"
37+
remote="erlang"/>
38+
<project name="icu4c" path="icu4c" revision="26359393672c378f41f2103a8699c4357c894be7"
39+
remote="couchbase"/>
40+
<project name="snappy" path="snappy" revision="5681dde156e9d07adbeeab79666c9a9d7a10ec95"
41+
remote="couchbase"/>
42+
<project name="v8" path="v8" revision="447decb75060a106131ab4de934bcc374648e7f2"
43+
remote="couchbase"/>
44+
<project name="gperftools" path="gperftools" revision="674fcd94a8a0a3595f64e13762ba3a6529e09926"
45+
remote="couchbase"/>
46+
<project name="pysqlite" path="pysqlite" revision="0ff6e32ea05037fddef1eb41a648f2a2141009ea"
47+
remote="couchbase"/>
48+
<!--
49+
<project name="voltron" path="voltron" revision="9e552378e4313362c6afd751d76610a255b05ecc" />
50+
--></manifest>

0 commit comments

Comments
 (0)