summaryrefslogtreecommitdiffstats
path: root/jack
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2015-05-04 15:18:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-05-04 15:18:47 +0000
commitf5c799da32f473d64db1312c3ef29d964db0cd86 (patch)
tree1d8563a7ac056be87e8d59c2af4d2afd50dcaf65 /jack
parent78011918fd355a8c1bf2e8e3baf3a48771176da9 (diff)
parentb6c274211885ab98ab19e81e09a3541a8413c097 (diff)
downloadtoolchain_jack-f5c799da32f473d64db1312c3ef29d964db0cd86.tar.gz
toolchain_jack-f5c799da32f473d64db1312c3ef29d964db0cd86.tar.bz2
toolchain_jack-f5c799da32f473d64db1312c3ef29d964db0cd86.zip
Merge "Bump version to 1.1-rc1" into ub-jack
Diffstat (limited to 'jack')
-rwxr-xr-xjack/etc/jack2
-rwxr-xr-xjack/etc/jack-admin2
-rw-r--r--jack/rsc/jack.properties6
3 files changed, 5 insertions, 5 deletions
diff --git a/jack/etc/jack b/jack/etc/jack
index 3f823e42..ad3b0350 100755
--- a/jack/etc/jack
+++ b/jack/etc/jack
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# v 1.1-a12
+# v 1.1-rc1
#
set -o nounset
umask 077
diff --git a/jack/etc/jack-admin b/jack/etc/jack-admin
index d2559908..3e1d0bb8 100755
--- a/jack/etc/jack-admin
+++ b/jack/etc/jack-admin
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# v 1.1-a12
+# v 1.1-rc1
#
set -o nounset
umask 077
diff --git a/jack/rsc/jack.properties b/jack/rsc/jack.properties
index c9d54c54..f8f2b06d 100644
--- a/jack/rsc/jack.properties
+++ b/jack/rsc/jack.properties
@@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-jack.version=1.1-a12
+jack.version=1.1-rc1
jack.version.release.name=Brest
jack.version.release.code=2
-jack.version.sub-release.kind=ALPHA
-jack.version.sub-release.code=13
+jack.version.sub-release.kind=CANDIDATE
+jack.version.sub-release.code=14
# These properties are added by the release step
# jack.version.buildid=<BUILDID>