GitHub user dangogh opened a pull request:
https://github.com/apache/incubator-trafficcontrol/pull/32
psql merge
trying this again without reusing a branch name. Last merge was 10/17.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dangogh/incubator-trafficcontrol psql-merge
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-trafficcontrol/pull/32.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #32
----
commit 1079df0f180e0899ce57035fe6c1a2da6e03b3f2
Author: Jan van Doorn <[email protected]>
Date: 2016-10-17T16:39:10Z
update README.md - link to users / dev lists
commit 198d4cf31ed2730a84f32274ea9b48d82b3795a9
Author: Jan van Doorn <[email protected]>
Date: 2016-10-17T16:41:09Z
update README.md - gh link
commit b50ac924218002136c550aa29b7d70ca0a6e4870
Author: Jan van Doorn <[email protected]>
Date: 2016-10-17T16:47:17Z
update README.md - JIRA link
This closes #1
commit 3e5b79e97a974912f8d5d1d43daa9a3ca72056cf
Author: Phil Sorber <[email protected]>
Date: 2016-10-17T18:41:12Z
Update subscribe link for dev list
commit 373ee0eba21d1606a79233aaf38b19052260d86d
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-18T16:14:48Z
revs docs version
commit 148af968772dee69bf9f0310a60119206dc9d2ba
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-18T16:19:36Z
updates to website html files for 1.7
commit 051b4fb2963f513360f487e85ae28b7ef6379335
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-18T19:42:06Z
changes the format of release.json file to match project name
commit 51dae6b5cdc6e16298fff9da7ce50fb9618dfd02
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-18T19:45:25Z
adds build files for TOv2
commit 46a72f70a7087ca280c42ea27ac29808bb109a06
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-18T21:32:05Z
sets character encoding to utf-8
commit a146c1403fd55ceddd8ff4ce3f7d8af4a6d60e91
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-18T21:45:11Z
adds nodejs server config template
commit 9e7a226d975afb5642b896ac56e7ea3f0a9f8081
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-18T23:42:56Z
adds morgan dependency that forever counts on
commit 8021276ab98dc8b5e12c4087225929bbba3cab12
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-18T23:50:07Z
no need to fetch deliveryservice regexes and exampleurls when fetching all
ds's for a table. just slows everything down for no reason
commit 71edde822a7459aca563a155772ab40f9b474787
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-19T03:44:54Z
fixes incorrect path to server config file
commit f0d49388ca436d0988821e2cadd9f2007c0ff067
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-18T21:03:44Z
diff calc for functions path
commit dc12e9fae8d6023948030294932962176bb495a3
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-18T21:09:12Z
remove portal refs from traffic_ops_v2 build
commit 8f69da7187cd634202b7fb346e09730aaba3bea4
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-18T22:36:06Z
copy artifacts from container
commit 55c9589d53c17a0e04db7c9d41c66848dce7024d
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-19T16:14:53Z
updates config-template.js for tov2 experimental
commit e408053577940e6f8af7ac2fd9273eea8179e1c9
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-19T20:17:13Z
add notes on using docker-compose for builds
commit 4c3cf21468fc986355d343cc4c41f6ccc7a96c06
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-19T20:58:41Z
refer to new apache product in docker build files
commit 2edcff7bc4f6475f1a4dd6b6e3b890aedb288770
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-19T21:45:47Z
This closes #3
commit 7d35ccc62b29c85a291e6979a1b01f5d96060035
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-19T21:48:13Z
This closes #2
commit 3735477aa870f0fcdc358684b2dc248d9e414cbf
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-20T14:24:14Z
Merge branch 'dockerbuild-cleanup' of
https://github.com/dangogh/incubator-trafficcontrol
This closes #5
commit b4ef41397c755c306da0bd6edd20b0c4d8e60077
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-20T14:42:14Z
fixes server config template
commit b74717722551e4b18efdb658d34bcfc1b5705767
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-20T14:45:55Z
Merge branch 'master' into tov2-build
commit 41308a435c55cb2fbdc3d1dad0b2a09f3e8efc52
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-20T14:48:22Z
Merge pull request #1 from dangogh/tov2-dockerbuild
updates to build using docker
commit d0fcb1a991206dd48cc951ff5859ce056b7c0caf
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-20T16:19:40Z
add docker build steps to TO v2 build
commit 0a151b17c546f3cab36ae319464d1b8fb9001b77
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-20T17:06:00Z
Merge pull request #3 from dangogh/tov2-readme
add docker build steps to TO v2 build
commit c738bd69d8b5a193aa23bd2974dcb57c8acf057b
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-20T17:09:01Z
changes docker image name
commit 2f4768910b869e0c502fe0f89b14db9795650b6c
Author: Jeremy Mitchell <[email protected]>
Date: 2016-10-20T17:46:27Z
clarifies config template
commit d3cb0abbc9f28fa3e633d38b9c1c77844744457d
Author: Dan Kirkwood <[email protected]>
Date: 2016-10-20T19:11:57Z
This closes #7
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
