You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/12/04 05:41:27 UTC
[01/22] incubator-trafficcontrol git commit: revcount and commit from
buildno
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/psql-rebase 5ceb8cb73 -> 570d605e1
revcount and commit from buildno
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/646b7e9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/646b7e9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/646b7e9b
Branch: refs/heads/psql-rebase
Commit: 646b7e9bcd017c940471fb198b32451872d4edc2
Parents: 5911d40
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sat Nov 12 19:00:25 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:44 2016 +0000
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/646b7e9b/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index c237288..6fa861f 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -58,7 +58,7 @@ function isInGitTree() {
function getBuildNumber() {
local in_git=$()
if isInGitTree; then
- local commits=$(getRevCount)
+ local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
[22/22] incubator-trafficcontrol git commit: Merge branch 'master' of
https://github.com/apache/incubator-trafficcontrol into psql-rebase
Posted by da...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-trafficcontrol into psql-rebase
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/570d605e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/570d605e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/570d605e
Branch: refs/heads/psql-rebase
Commit: 570d605e1e4b3f250757648c8a8fed4f90b4ea73
Parents: 5ceb8cb 78b5c0c
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sun Dec 4 05:39:57 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Sun Dec 4 05:39:57 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/22] incubator-trafficcontrol git commit: revcount and commit from
buildno
Posted by da...@apache.org.
revcount and commit from buildno
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c2564669
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c2564669
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c2564669
Branch: refs/heads/psql-rebase
Commit: c2564669f3e206d88959fabb7338352b67e25aa7
Parents: df48015
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sat Nov 12 19:00:25 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:44 2016 +0000
----------------------------------------------------------------------
build/functions.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c2564669/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 4f56e7a..6fa861f 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -44,7 +44,8 @@ function versionOk() {
# ---------------------------------------
function getRevCount() {
- git rev-list HEAD 2>/dev/null | wc -l
+ local buildNum=$(getBuildNumber)
+ echo ${buildNum%.*}
}
# ---------------------------------------
@@ -57,7 +58,7 @@ function isInGitTree() {
function getBuildNumber() {
local in_git=$()
if isInGitTree; then
- local commits=$(getRevCount)
+ local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
@@ -85,7 +86,8 @@ function getRhelVersion {
# ---------------------------------------
function getCommit() {
- git rev-parse HEAD
+ local buildNum=$(getBuildNumber)
+ echo ${buildNum%.*}
}
# ---------------------------------------
[07/22] incubator-trafficcontrol git commit: separate BUILD_NUMBER
and RHEL_NUMBER during build
Posted by da...@apache.org.
separate BUILD_NUMBER and RHEL_NUMBER during build
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/45ec104a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/45ec104a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/45ec104a
Branch: refs/heads/psql-rebase
Commit: 45ec104a1bcdfdcda8a41f3613a7d2f7352a7adf
Parents: 8e86acf
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 28 15:36:32 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 28 15:36:32 2016 -0700
----------------------------------------------------------------------
build/functions.sh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/45ec104a/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 6fa861f..874c7e0 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -93,7 +93,8 @@ function getCommit() {
# ---------------------------------------
function checkEnvironment {
export TC_VERSION=$(getVersion "$TC_DIR")
- export BUILD_NUMBER="${BUILD_NUMBER:-$(getBuildNumber)}.$(getRhelVersion)"
+ export BUILD_NUMBER=$(getBuildNumber)
+ export RHEL_VERSION=$(getRhelVersion)
export WORKSPACE=${WORKSPACE:-$TC_DIR}
export RPMBUILD="$WORKSPACE/rpmbuild"
export DIST="$WORKSPACE/dist"
@@ -115,6 +116,7 @@ function checkEnvironment {
echo "=================================================="
echo "WORKSPACE: $WORKSPACE"
echo "BUILD_NUMBER: $BUILD_NUMBER"
+ echo "RHEL_VERSION: $RHEL_VERSION"
echo "TC_VERSION: $TC_VERSION"
echo "--------------------------------------------------"
}
@@ -130,15 +132,16 @@ function createSourceDir() {
# ---------------------------------------
function buildRpm () {
for package in "$@"; do
- local rpm="${package}-${TC_VERSION}-${BUILD_NUMBER}.$(uname -m).rpm"
- local srpm="${package}-${TC_VERSION}-${BUILD_NUMBER}.src.rpm"
+ local pre="${package}-${TC_VERSION}-${BUILD_NUMBER}.${RHEL_VERSION}"
+ local rpm="${pre}.$(uname -m).rpm"
+ local srpm="${pre}.src.rpm"
echo "Building the rpm."
cd "$RPMBUILD" && \
rpmbuild --define "_topdir $(pwd)" \
--define "traffic_control_version $TC_VERSION" \
--define "commit $(getCommit)" \
- --define "build_number $BUILD_NUMBER" \
+ --define "build_number $BUILD_NUMBER.$RHEL_VERSION" \
-ba SPECS/$package.spec || \
{ echo "RPM BUILD FAILED: $?"; exit 1; }
[13/22] incubator-trafficcontrol git commit: use env BUILD_NUMBER and
RHEL_NUMBER for release name
Posted by da...@apache.org.
use env BUILD_NUMBER and RHEL_NUMBER for release name
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7868dd93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7868dd93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7868dd93
Branch: refs/heads/psql-rebase
Commit: 7868dd931ffe3e1388f587e2e735289ba824f69a
Parents: 8fb497d
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 20:38:43 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700
----------------------------------------------------------------------
traffic_monitor/pom.xml | 5 +++--
traffic_router/build/pom.xml | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7868dd93/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index b6887c7..5075610 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -301,7 +301,8 @@ under the License.
<configuration>
<rules>
<requireEnvironmentVariable>
- <variableName>GIT_REV_COUNT</variableName>
+ <variableName>BUILD_NUMBER</variableName>
+ <variableName>RHEL_VERSION</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -338,7 +339,7 @@ under the License.
</executions>
<configuration>
<group>Applications/Internet</group>
- <release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>
+ <release>${env.BUILD_NUMBER}.${env.RHEL_VERSION}</release>
<needarch>x86_64</needarch>
<mappings>
<mapping>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7868dd93/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index a4e611b..dcb8835 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -88,6 +88,7 @@
<rules>
<requireEnvironmentVariable>
<variableName>BUILD_NUMBER</variableName>
+ <variableName>RHEL_VERSION</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -125,7 +126,7 @@
<configuration>
<group>Applications/Internet</group>
<name>${project.parent.artifactId}</name>
- <release>${env.BUILD_NUMBER}.el6</release>
+ <release>${env.BUILD_NUMBER}.${env.RHEL_VERSION}</release>
<needarch>x86_64</needarch>
<mappings>
<mapping>
[16/22] incubator-trafficcontrol git commit: up traffic_monitor and
traffic_router to version 1.9.0
Posted by da...@apache.org.
up traffic_monitor and traffic_router to version 1.9.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/96711d53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/96711d53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/96711d53
Branch: refs/heads/psql-rebase
Commit: 96711d53de82f5da337c1ee3574c72a4e505f0fe
Parents: 7868dd9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 20:47:47 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700
----------------------------------------------------------------------
traffic_monitor/pom.xml | 2 +-
traffic_router/build/pom.xml | 2 +-
traffic_router/configuration/pom.xml | 2 +-
traffic_router/connector/pom.xml | 2 +-
traffic_router/core/pom.xml | 2 +-
traffic_router/geolocation/pom.xml | 2 +-
traffic_router/neustar/pom.xml | 2 +-
traffic_router/pom.xml | 2 +-
traffic_router/shared/pom.xml | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index 5075610..7c59495 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>com.comcast.cdn.traffic_control</groupId>
<artifactId>traffic_monitor</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
<packaging>war</packaging>
<scm>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index dcb8835..a860b15 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<scm>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/configuration/pom.xml b/traffic_router/configuration/pom.xml
index 5f80e15..0d0ff89 100644
--- a/traffic_router/configuration/pom.xml
+++ b/traffic_router/configuration/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/connector/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/connector/pom.xml b/traffic_router/connector/pom.xml
index 74e0a07..3878e3e 100644
--- a/traffic_router/connector/pom.xml
+++ b/traffic_router/connector/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<artifactId>traffic_router_connector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/core/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml
index f2ec0cd..cfb97c2 100644
--- a/traffic_router/core/pom.xml
+++ b/traffic_router/core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<artifactId>traffic_router_core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/geolocation/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/geolocation/pom.xml b/traffic_router/geolocation/pom.xml
index c2d6224..3e95cf1 100644
--- a/traffic_router/geolocation/pom.xml
+++ b/traffic_router/geolocation/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/neustar/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/pom.xml b/traffic_router/neustar/pom.xml
index 002467c..48a5326 100644
--- a/traffic_router/neustar/pom.xml
+++ b/traffic_router/neustar/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml
index 78badf3..1148c49 100644
--- a/traffic_router/pom.xml
+++ b/traffic_router/pom.xml
@@ -18,7 +18,7 @@
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
<packaging>pom</packaging>
<name>traffic_router</name>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/shared/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml
index d9cd43a..329038c 100644
--- a/traffic_router/shared/pom.xml
+++ b/traffic_router/shared/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[17/22] incubator-trafficcontrol git commit: This closes #111
Posted by da...@apache.org.
This closes #111
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/15c8451d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/15c8451d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/15c8451d
Branch: refs/heads/psql-rebase
Commit: 15c8451d17a41e4ce7a4f289a945afd3dfcf67bd
Parents: e06fbf8
Author: Dave Neuman <ne...@apache.org>
Authored: Wed Nov 30 08:50:36 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:36 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[19/22] incubator-trafficcontrol git commit: This closes #116.
Posted by da...@apache.org.
This closes #116.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c86af509
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c86af509
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c86af509
Branch: refs/heads/psql-rebase
Commit: c86af50941b1ebeb9a794bc68296623a3868beb9
Parents: 9393e97
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Dec 1 21:10:32 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Thu Dec 1 21:10:32 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/22] incubator-trafficcontrol git commit: This closes #107
Posted by da...@apache.org.
This closes #107
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8fb497d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8fb497d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8fb497d6
Branch: refs/heads/psql-rebase
Commit: 8fb497d6068966ca29da2790aaf3ff1a4cf8141d
Parents: e4e95e7
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Nov 29 10:00:21 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Nov 29 10:00:21 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/22] incubator-trafficcontrol git commit: use $BUILD_NUMBER from
env for traffic_router version
Posted by da...@apache.org.
use $BUILD_NUMBER from env for traffic_router version
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/cb93b43e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/cb93b43e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/cb93b43e
Branch: refs/heads/psql-rebase
Commit: cb93b43e1c347c3838f493d387086af1a2519e81
Parents: 646b7e9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 21 19:55:40 2016 +0000
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:45 2016 +0000
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 2 +-
traffic_router/build/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/cb93b43e/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index a7fc5ff..43d6943 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -56,7 +56,7 @@ function buildRpmTrafficRouter () {
installDnsSec
cd "$TR_DIR" || { echo "Could not cd to $TR_DIR: $?"; exit 1; }
- export GIT_REV_COUNT=$(getRevCount)
+ export BUILD_NUMBER=${BUILD_NUMBER:-$(getBuildNumber)}
mvn -P rpm-build -Dmaven.test.skip=true -DminimumTPS=1 clean package || \
{ echo "RPM BUILD FAILED: $?"; exit 1; }
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/cb93b43e/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index fc30608..a4e611b 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -87,7 +87,7 @@
<configuration>
<rules>
<requireEnvironmentVariable>
- <variableName>GIT_REV_COUNT</variableName>
+ <variableName>BUILD_NUMBER</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -125,7 +125,7 @@
<configuration>
<group>Applications/Internet</group>
<name>${project.parent.artifactId}</name>
- <release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>
+ <release>${env.BUILD_NUMBER}.el6</release>
<needarch>x86_64</needarch>
<mappings>
<mapping>
[10/22] incubator-trafficcontrol git commit: This closes #109
Posted by da...@apache.org.
This closes #109
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/03355297
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/03355297
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/03355297
Branch: refs/heads/psql-rebase
Commit: 033552978e989b05880a80518af05f696dbc737d
Parents: 6a3f52f
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Nov 29 09:57:40 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Nov 29 09:57:40 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[20/22] incubator-trafficcontrol git commit: explicitly define
project name when creating the tarball
Posted by da...@apache.org.
explicitly define project name when creating the tarball
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9ba1de9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9ba1de9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9ba1de9c
Branch: refs/heads/psql-rebase
Commit: 9ba1de9c69cf5a138873c04fe5a5294322af38b5
Parents: c86af50
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Dec 1 13:49:25 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Dec 1 14:53:53 2016 -0700
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9ba1de9c/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 874c7e0..0991fac 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -159,7 +159,7 @@ function buildRpm () {
# ---------------------------------------
function createTarball() {
local projDir=$(cd "$1"; pwd)
- local projName=$(basename $projDir)
+ local projName=incubator-trafficcontrol
local version=$(getVersion "$TC_DIR")
local buildNum=$(getBuildNumber)
local tarball="dist/$projName-$version.$buildNum.tar.gz"
[08/22] incubator-trafficcontrol git commit: This closes #106
Posted by da...@apache.org.
This closes #106
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/da9bd9ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/da9bd9ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/da9bd9ad
Branch: refs/heads/psql-rebase
Commit: da9bd9ad49094ba0438ac71b4a1802ecf5925c3c
Parents: 45ec104
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Nov 29 08:07:32 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Nov 29 08:07:32 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/22] incubator-trafficcontrol git commit: This closes #75
Posted by da...@apache.org.
This closes #75
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8e86acff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8e86acff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8e86acff
Branch: refs/heads/psql-rebase
Commit: 8e86acff95b9001aa931f8fde43c96557613c0c4
Parents: cb93b43
Author: Jan van Doorn <jv...@apache.org>
Authored: Mon Nov 28 16:44:41 2016 +0000
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:44:41 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/22] incubator-trafficcontrol git commit: if not in git tree,
no tarball
Posted by da...@apache.org.
if not in git tree, no tarball
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5911d404
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5911d404
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5911d404
Branch: refs/heads/psql-rebase
Commit: 5911d404d46a78926626d0f781caff926f7b6ce9
Parents: c256466
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Nov 11 18:41:11 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:44 2016 +0000
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5911d404/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 6fa861f..c237288 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -58,7 +58,7 @@ function isInGitTree() {
function getBuildNumber() {
local in_git=$()
if isInGitTree; then
- local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
+ local commits=$(getRevCount)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
[21/22] incubator-trafficcontrol git commit: This closes #118
Posted by da...@apache.org.
This closes #118
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/78b5c0c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/78b5c0c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/78b5c0c4
Branch: refs/heads/psql-rebase
Commit: 78b5c0c4e0968f3e632e5fd2951621a238b6277b
Parents: 9ba1de9
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Dec 1 14:54:16 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Dec 1 14:54:16 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/22] incubator-trafficcontrol git commit: cd to traffic_router
prior to setting version
Posted by da...@apache.org.
cd to traffic_router prior to setting version
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3003a304
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3003a304
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3003a304
Branch: refs/heads/psql-rebase
Commit: 3003a304cf34c255ca0e6381f8b60d1bce392d47
Parents: 96711d5
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 22:39:40 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3003a304/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index 43d6943..20d3910 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -117,7 +117,7 @@ function initBuildArea() {
export MVN_CMD="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
echo $MVN_CMD
- $MVN_CMD
+ (cd $TR_DIR; $MVN_CMD)
cp -r "$TR_DIR"/{build,connector,core} "$tr_dest"/. || { echo "Could not copy to $tr_dest: $?"; exit 1; }
cp "$TR_DIR"/pom.xml "$tr_dest" || { echo "Could not copy to $tr_dest: $?"; exit 1; }
[04/22] incubator-trafficcontrol git commit: if not in git tree,
no tarball
Posted by da...@apache.org.
if not in git tree, no tarball
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/df480152
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/df480152
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/df480152
Branch: refs/heads/psql-rebase
Commit: df480152e958ff3e137974c5064743d1edeadfab
Parents: ca648d9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Nov 11 18:41:11 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:44 2016 +0000
----------------------------------------------------------------------
build/build.sh | 12 +++++++-----
build/functions.sh | 7 ++++---
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/df480152/build/build.sh
----------------------------------------------------------------------
diff --git a/build/build.sh b/build/build.sh
index 1327280..32d47d4 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -28,11 +28,13 @@ export TC_DIR=$(dirname $(dirname "$topscript"))
checkEnvironment
# Create tarball first
-projName=$(basename $(pwd))
-echo "----- Building tarball ..."
-tarball=$(createTarball "$TC_DIR")
-ls -l $tarball
-
+if isInGitTree; then
+ echo "----- Building tarball ..."
+ tarball=$(createTarball "$TC_DIR")
+ ls -l $tarball
+else
+ echo "---- Skipping tarball creation"
+fi
if [[ $# -gt 0 ]]; then
projects=( "$*" )
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/df480152/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 2132064..4f56e7a 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -49,13 +49,14 @@ function getRevCount() {
# ---------------------------------------
function isInGitTree() {
- git rev-parse --is-inside-work-tree 2>/dev/null
+ # ignore output -- use exit status
+ git rev-parse --is-inside-work-tree >/dev/null 2>&1
}
# ---------------------------------------
function getBuildNumber() {
- local in_git=$(isInGitTree)
- if [[ $in_git ]]; then
+ local in_git=$()
+ if isInGitTree; then
local commits=$(getRevCount)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
[18/22] incubator-trafficcontrol git commit: Update LICENSE,
NOTICE with Maxmind CCSA-4.0 IL and attribution
Posted by da...@apache.org.
Update LICENSE, NOTICE with Maxmind CCSA-4.0 IL and attribution
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9393e97e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9393e97e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9393e97e
Branch: refs/heads/psql-rebase
Commit: 9393e97eaa4efab360ea32c39dcaace85d5c442f
Parents: 15c8451
Author: Eric Friedrich <li...@users.noreply.github.com>
Authored: Thu Dec 1 15:44:36 2016 -0500
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Thu Dec 1 21:09:46 2016 +0000
----------------------------------------------------------------------
LICENSE | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
NOTICE | 3 ++
2 files changed, 100 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9393e97e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index da7fafb..548ed0b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -523,3 +523,100 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+For the MaxMind DB GeoLite2 Database:
+Creative Commons Attribution-ShareAlike 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+Section 1 \u2013 Definitions.
+
+Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
+Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
+Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+Licensor means the individual(s) or entity(ies) granting rights under this Public License.
+Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+Section 2 \u2013 Scope.
+
+License grant.
+Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+reproduce and Share the Licensed Material, in whole or in part; and
+produce, reproduce, and Share Adapted Material.
+Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+Term. The term of this Public License is specified in Section 6(a).
+Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+Downstream recipients.
+Offer from the Licensor \u2013 Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+Additional offer from the Licensor \u2013 Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter\u2019s License You apply.
+No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+Other rights.
+
+Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+Patent and trademark rights are not licensed under this Public License.
+To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+Section 3 \u2013 License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+Attribution.
+
+If You Share the Licensed Material (including in modified form), You must:
+
+retain the following if it is supplied by the Licensor with the Licensed Material:
+identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+a copyright notice;
+a notice that refers to this Public License;
+a notice that refers to the disclaimer of warranties;
+a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+ShareAlike.
+In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
+
+The Adapter\u2019s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
+You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
+You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
+Section 4 \u2013 Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
+if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
+You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+Section 5 \u2013 Disclaimer of Warranties and Limitation of Liability.
+
+Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
+To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
+The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+Section 6 \u2013 Term and Termination.
+
+This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+upon express reinstatement by the Licensor.
+For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+Section 7 \u2013 Other Terms and Conditions.
+
+The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+Section 8 \u2013 Interpretation.
+
+For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9393e97e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 607f549..49bd157 100644
--- a/NOTICE
+++ b/NOTICE
@@ -9,3 +9,6 @@ Comcast (http://www.comcast.com/).
Portions of this software were developed at
Cisco Systems, Inc. (http://www.cisco.com)
+
+This product includes GeoLite2 data created by MaxMind, available from
+<a href="http://www.maxmind.com">http://www.maxmind.com</a>.
[11/22] incubator-trafficcontrol git commit: [TC-54] - Obtain the ATS
user's UID after package installation during ORT.
Posted by da...@apache.org.
[TC-54] - Obtain the ATS user's UID after package installation during ORT.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e4e95e79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e4e95e79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e4e95e79
Branch: refs/heads/psql-rebase
Commit: e4e95e79d4d6b864be336efcfbb81baa67f42484
Parents: 0335529
Author: Jeff Elsloo <je...@cable.comcast.com>
Authored: Mon Nov 28 15:52:20 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Nov 29 09:59:48 2016 -0700
----------------------------------------------------------------------
traffic_ops/bin/traffic_ops_ort.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e4e95e79/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 0d9f018..8a75bdf 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -172,7 +172,6 @@ my %install_tracker;
my $config_dirs = undef;
my $cfg_file_tracker = undef;
my $ssl_tracker = undef;
-my $ats_uid = getpwnam("ats");
####-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-####
#### Start main flow
@@ -198,7 +197,8 @@ if ( $script_mode == $BADASS || $script_mode == $INTERACTIVE || $script_mode ==
my $header_comment = &get_header_comment($traffic_ops_host);
&process_packages( $hostname_short, $traffic_ops_host );
-
+# get the ats user's UID after package installation in case this is the initial badass
+my $ats_uid = getpwnam("ats");
&process_chkconfig( $hostname_short, $traffic_ops_host );
#### First time
[09/22] incubator-trafficcontrol git commit: cd to traffic_monitor
prior to mvn call
Posted by da...@apache.org.
cd to traffic_monitor prior to mvn call
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6a3f52f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6a3f52f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6a3f52f5
Branch: refs/heads/psql-rebase
Commit: 6a3f52f56608b0796d20ec38d78594420b06e125
Parents: da9bd9a
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 16:18:55 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Nov 29 16:18:55 2016 +0000
----------------------------------------------------------------------
traffic_monitor/build/build_rpm.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6a3f52f5/traffic_monitor/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/build/build_rpm.sh b/traffic_monitor/build/build_rpm.sh
index e8970a0..cb14028 100755
--- a/traffic_monitor/build/build_rpm.sh
+++ b/traffic_monitor/build/build_rpm.sh
@@ -62,9 +62,9 @@ function initBuildArea() {
tm_dest=$(createSourceDir traffic_monitor)
export TRAFFIC_CONTROL_VERSION="$TC_VERSION"
- export MVN_CMD="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
- echo $MVN_CMD
- $MVN_CMD
+ local mvn_cmd="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
+ echo $mvn_cmd
+ (cd "$TM_DIR"; $mvn_cmd)
cp -r "$TM_DIR"/{build,etc,src} "$tm_dest"/. || { echo "Could not copy to $tm_dest: $?"; exit 1; }
cp "$TM_DIR"/pom.xml "$tm_dest" || { echo "Could not copy to $tm_dest: $?"; exit 1; }
[15/22] incubator-trafficcontrol git commit: fix ref to TC_VERSION
Posted by da...@apache.org.
fix ref to TC_VERSION
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e06fbf85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e06fbf85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e06fbf85
Branch: refs/heads/psql-rebase
Commit: e06fbf852c91aea48103366db99f94857e72857a
Parents: 3003a30
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 22:56:56 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e06fbf85/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index 20d3910..da559fd 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -105,7 +105,6 @@ function checkEnvironment() {
echo "TC_VERSION: $TC_VERSION"
echo "RPM: $RPM"
echo "--------------------------------------------------"
- export TRAFFIC_CONTROL_VERSION="$TC_VERSION"
}
# ---------------------------------------
@@ -115,7 +114,7 @@ function initBuildArea() {
tr_dest=$(createSourceDir traffic_router)
- export MVN_CMD="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
+ export MVN_CMD="mvn versions:set -DnewVersion=$TC_VERSION"
echo $MVN_CMD
(cd $TR_DIR; $MVN_CMD)
cp -r "$TR_DIR"/{build,connector,core} "$tr_dest"/. || { echo "Could not copy to $tr_dest: $?"; exit 1; }