You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2017/11/02 07:55:27 UTC
mesos git commit: Replaced `concurrentqueue-1.0.0-beta` with
`concurrentqueue-7b69a8f`.
Repository: mesos
Updated Branches:
refs/heads/master fa747ac36 -> 9e8bb0c39
Replaced `concurrentqueue-1.0.0-beta` with `concurrentqueue-7b69a8f`.
Our upstreamed PR to the `concurrentqueue` project was merged,
(https://github.com/cameron314/concurrentqueue/commit/420509b)
which fixes the Clang / libstdc++ configuration. Since there are
a bunch of bug fixes committed to `master` since `v1.0.0-beta`,
we bundle the latest SHA on `master` here.
Review: https://reviews.apache.org/r/63472
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9e8bb0c3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9e8bb0c3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9e8bb0c3
Branch: refs/heads/master
Commit: 9e8bb0c3957472bffeb93d4703a56dd7c3a1cf51
Parents: fa747ac
Author: Michael Park <mp...@apache.org>
Authored: Thu Nov 2 00:12:41 2017 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Thu Nov 2 00:55:07 2017 -0700
----------------------------------------------------------------------
3rdparty/cmake/Versions.cmake | 4 ++--
3rdparty/concurrentqueue-1.0.0-beta.tar.gz | Bin 1369950 -> 0 bytes
3rdparty/concurrentqueue-7b69a8f.tar.gz | Bin 0 -> 1370846 bytes
3rdparty/concurrentqueue.md | 9 +++++++++
3rdparty/versions.am | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9e8bb0c3/3rdparty/cmake/Versions.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index 9a6713d..da2d837 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -1,7 +1,7 @@
set(BOOST_VERSION "1.53.0")
set(BOOST_HASH "SHA256=CED7CE2ED8D7D34815AC9DB1D18D28FCD386FFBB3DE6DA45303E1CF193717038")
-set(CONCURRENTQUEUE_VERSION "1.0.0-beta")
-set(CONCURRENTQUEUE_HASH "SHA256=D723E784E4D54F7519208BD795F2AA799A449B873DBB7A1251F288E04BE23465")
+set(CONCURRENTQUEUE_VERSION "7b69a8f")
+set(CONCURRENTQUEUE_HASH "SHA256=B2741A1FB2172C2A829503A85D5EE7548BE7ED04236A3FD1EFD2B6088E065CB7")
set(CURL_VERSION "7.43.0")
set(CURL_HASH "SHA256=1A084DA1EDBFC3BD632861358B26AF45BA91AAADFB15D6482DE55748B8DFC693")
set(ELFIO_VERSION "3.2")
http://git-wip-us.apache.org/repos/asf/mesos/blob/9e8bb0c3/3rdparty/concurrentqueue-1.0.0-beta.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/concurrentqueue-1.0.0-beta.tar.gz b/3rdparty/concurrentqueue-1.0.0-beta.tar.gz
deleted file mode 100644
index 1bf4a88..0000000
Binary files a/3rdparty/concurrentqueue-1.0.0-beta.tar.gz and /dev/null differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/9e8bb0c3/3rdparty/concurrentqueue-7b69a8f.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/concurrentqueue-7b69a8f.tar.gz b/3rdparty/concurrentqueue-7b69a8f.tar.gz
new file mode 100644
index 0000000..63dc94a
Binary files /dev/null and b/3rdparty/concurrentqueue-7b69a8f.tar.gz differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/9e8bb0c3/3rdparty/concurrentqueue.md
----------------------------------------------------------------------
diff --git a/3rdparty/concurrentqueue.md b/3rdparty/concurrentqueue.md
new file mode 100644
index 0000000..1c35621
--- /dev/null
+++ b/3rdparty/concurrentqueue.md
@@ -0,0 +1,9 @@
+# [`concurrentqueue`](https://github.com/cameron314/concurrentqueue)
+
+There is no official release of this project as of Nov 1, 2017. There is
+a `v1.0.0-beta` *pre*-release, but we bundle the SHA at [7b69a8f] since
+there has been a bunch of bug fixes committed to `master`, including one
+of our own [420509b].
+
+[420509b]: https://github.com/cameron314/concurrentqueue/commit/420509b
+[7b69a8f]: https://github.com/cameron314/concurrentqueue/commit/7b69a8f
http://git-wip-us.apache.org/repos/asf/mesos/blob/9e8bb0c3/3rdparty/versions.am
----------------------------------------------------------------------
diff --git a/3rdparty/versions.am b/3rdparty/versions.am
index cbab26d..2fc2f2c 100644
--- a/3rdparty/versions.am
+++ b/3rdparty/versions.am
@@ -20,7 +20,7 @@
# still need to update version numbers in src/python/setup.py.in too!
BOOST_VERSION = 1.53.0
-CONCURRENTQUEUE_VERSION = 1.0.0-beta
+CONCURRENTQUEUE_VERSION = 7b69a8f
CSI_VERSION = 0.1.0
ELFIO_VERSION = 3.2
GLOG_VERSION = 0.3.3