Граф коммитов

1314 Коммитов

Автор SHA1 Сообщение Дата
Philippe M. Chiasson 4e5344c6e3 Merge remote-tracking branch 'upstream/master' 2012-05-29 12:47:26 -04:00
Philippe M. Chiasson 9678b86872 Merge remote-tracking branch 'upstream/master' 2012-05-28 16:49:50 -04:00
Anfernee Gui f7f7354c29 [HM] Fix Gemfile for missing nats
Change-Id: Icb07e0fe8e51699b9cb435c2c12831baac13d968
2012-05-28 03:02:08 -07:00
Jennifer Hickey 1b332085eb Merge "Allow any whitespace between 'require' and 'sinatra' in main Sinatra app file" 2012-05-25 21:01:14 +00:00
Philippe M. Chiasson 024f67ba4d Update submodules to all be relative 2012-05-25 14:21:48 -04:00
Philippe M. Chiasson bf2d16aa83 relative urls test 2012-05-25 14:09:22 -04:00
Philippe M. Chiasson fdae57e559 cleanup 2012-05-25 14:07:44 -04:00
Philippe M. Chiasson 0b6495d06c cleanup 2012-05-25 14:06:32 -04:00
Philippe M. Chiasson cea7429c68 use relative locations for the submodules 2012-05-25 14:00:38 -04:00
Jesse Zhang 79ab798fb3 [CC][HM] Remove vendor cache
Test plan: create a release and pass BVTs

Change-Id: I80b997859c8366fd379dc00fd2fa097aebe91623
2012-05-24 16:57:23 -07:00
Jennifer Hickey cc89d6bf18 Allow any whitespace between 'require' and 'sinatra'
in main Sinatra app file

Change-Id: I430575cde67eb30db059b0ece554434ee01d246f
2012-05-24 14:52:08 -07:00
Jesse Zhang 75863fd73b [router][staging] Add license
In preparation of splitting out router and vcap_staging gem

Change-Id: I360d0c6040c003ed611b89072ff235b388cb7879
2012-05-24 12:56:57 -07:00
Satoru Chinen a14baf8f6b Merge "[dev_setup] Fix memcached service chef cookbook." 2012-05-23 23:01:37 +00:00
Harshawardhan Gadgil 8e6f144e60 Updated readme explaining exclusion of components on dev setup
- Modified vcap binary to show summary of exclusion and point to documentation
Change-Id: Iee8d5defe6021f2eb5bfcb43de46724731574194
2012-05-23 12:41:35 -07:00
Satoru Chinen 2d4db88764 [dev_setup] Fix memcached service chef cookbook.
- change libevent source url (cf_remote_file does not support download from https and redirect yet).
- add checksums (for cf_remote_file).
- use dev_setup cache.

Change-Id: I3ef634af15d99d44e12287427f8e4dbaf8153509
2012-05-23 07:46:36 +09:00
Jesse Zhang d51e0036e4 Merge changes I8068a506,I7ddc6b07
* changes:
  [dev_setup] Use github for lua-cjson source
  [dev_setup] set owner of mongo tarball
2012-05-22 20:54:34 +00:00
Harshawardhan Gadgil 651f27021c [devsetup] memcached statically linked to libevent, disable sasl
Change-Id: Idb8bfd06276c19f69c3fa7b5f44d9fea5196adce
2012-05-22 11:38:43 -07:00
Harshawardhan Gadgil 1ac418e077 Install libevent locally to have memcached config dependency fulfilled
Change-Id: Ie133e24fc6588285b46fb3dd199e72652b998049
2012-05-21 23:30:12 -07:00
Haipeng Wu d25c24f83c Merge "Add an api for CC, which returns a specific service offering Get /services/v1/offerings/:label" 2012-05-22 03:04:16 +00:00
Chunjie 8a0d0c6e32 Merge "mkae nuke_service.rb path to be correct." 2012-05-22 02:40:02 +00:00
Haipeng Wu af4627808e Add an api for CC, which returns a specific service offering
Get /services/v1/offerings/:label

Change-Id: I47e66278d0782e095b553cafbc904591e25b5571
2012-05-22 08:14:56 +08:00
Jesse Zhang 0f4be4814f [dev_setup] Use github for lua-cjson source
This change switches to downloading the source from github to avoid
outage of lua-cjson's author's homepage.

  Test plan:
    Run dev_setup on a vanilla VM and pass BVTs

Change-Id: I8068a5060014b46847cfa288916e282de22fb88a
2012-05-21 16:13:50 -07:00
Jesse Zhang bdca700e92 [dev_setup] set owner of mongo tarball
Correcting my stupidity of commenting out the ownership and permission
attributes in commit 2abb03a9.

Change-Id: I7ddc6b070cb167d3285ece9aba3390a837fe4114
2012-05-21 16:12:55 -07:00
Jesse Zhang 43479e93ff [stager] Add license and notice to stager
This change adds a license and notice file to the stager sub dir in
preparation for giving it its own repo.

Change-Id: I7fbdd2895b4d556f9439ae900b461ad7955ab798
2012-05-21 15:46:26 -07:00
Jesse Zhang 2abb03a932 [dev_setup] Fix Chef regression
This change replaces the use of remote_file with cf_remote_file to
work around two limitations in Chef 0.10:
  - Chef shares its downloading logic of remote_file with its REST
    client.  The REST client decompresses archives when it sees the
    header "Content-Encoding: gzip", which is an undesirable behavior
    for remote_file.
  - Chef only uses the specified checksum to trigger update, but it does
    no validation after new remote files are downloaded.

  Our requirement of cf_remote_file:
  - Don't do content decoding magic
  - checksum required and *always* validates the checksum

  Test plan: remove locally compiled ruby and the cached tarballs, run
dev_setup.

Change-Id: Ifb91188ec7ec2f77fafc671d128625ec0f8f1c77
2012-05-21 12:41:30 -07:00
Harshawardhan Gadgil b31c1af7b0 Merge "Dev setup support for memcached as a service" 2012-05-21 19:21:00 +00:00
Chunjie a7be863c5f mkae nuke_service.rb path to be correct.
Change-Id: Id1afeaa36ec58b7451506f8d70e023d77e2c9b2d
2012-05-21 05:40:50 -07:00
Dale Olds 6f4acf0733 update uaa with fix for web authorization approval UI, and tests for the fix
update secoauth, fix uaa devsetup

Change-Id: I9d568830fddcd88701cbe507bca3cbb04174000c
2012-05-18 13:08:57 -07:00
Jesse Zhang 8cd5856bc8 Merge "[README] Update legacy env var" 2012-05-18 19:51:35 +00:00
Jesse Zhang 246304ac37 [README] Update legacy env var
Reference VCAP_APP_{HOST,PORT} instead of the legacy VMC_* vars

Change-Id: I8733e41fb3e8db7c74bf6fd1cc962cb87d0a0f7e
2012-05-17 21:36:25 -07:00
Nicholas Kushmerick be6ee512ef Merge branch 'services-r11'
- bump vcap/services
- bump vcap_common gem version to 1.0.12

Conflicts:
	cloud_controller/Gemfile.lock
	cloud_controller/vendor/cache/vcap_common-1.0.11.gem
	common/vcap_common.gemspec

Change-Id: I09534faafb367a6cd2046c7fa4e15700366019e4
2012-05-17 18:16:19 -07:00
Jesse Zhang dee93e6300 Change URL to Lucid
Point the download URL of Ubuntu to the page for 10.04

Change-Id: I2e63a4dcf01a5f5e46af77fe18230b282e060e0b
2012-05-16 23:34:13 -07:00
Dale Olds bb8497638a Merge "Deploy the UAA in dev setup exactly like we would in bosh." 2012-05-17 01:29:00 +00:00
Thomas Risberg 288c628068 Merge "Java and Spring fixes for javaee namespace and use of AnnotationConfigWebApplicationContext" 2012-05-16 23:45:25 +00:00
Joel D'sa d0fd9bb06c Deploy the UAA in dev setup exactly like we would in bosh.
Change-Id: I393c3787dc0bb051ce0071e03e08a01a48bce5b5
2012-05-16 10:30:24 -07:00
Dave Syer 97b6af10b6 Merge "CF-29: add vcap_components from command line if present" 2012-05-15 20:05:57 +00:00
Harshawardhan Gadgil b00249e238 Dev setup support for memcached as a service
- Configure sasldb and lib event when going dev setup for memcached
- Addressed CR comments
- Updated vcap to remove couchdb from optional services, this change will be made later
- Cleaned up memcache dev setup recipie (in place edit of saslauthd config file)
- Configured neo4j and memcached to be excluded by default, use environment variable to override
- Config files corrections from CR comments
- Deleted unused file, added default 16M memory for memcached instance

Change-Id: I3f28d4b42989af6dc56ca1757daff93b43b5f6d7
2012-05-14 18:00:35 -07:00
Anfernee Gui 0c46aefe46 Merge changes I0a087b84,If5b7924f
* changes:
  [router] Use pidfile utils in vcap_common. Disable thin's signal to avoid swallowing signals.
  [router] Remove legacy statistics collecting code
2012-05-14 23:32:44 +00:00
Jesse Zhang 4fc210c762 [dev_setup] Group should be an integer
Newer versions of Chef varies its behavior based on the type of GID.
This patch (kudos to Doug MacEachern) makes both new and old versions
happy.

Change-Id: Ib7f05899d2e2e04ca34385512efcad8509d9cc5d
2012-05-14 12:49:37 -07:00
Bob Nugmanov f01313f758 Merge "bump logging gem and point to git repo with a SHA ref" 2012-05-14 19:40:08 +00:00
Thomas Risberg ddb8f52d22 Java and Spring fixes for javaee namespace and use of AnnotationConfigWebApplicationContext
- Fixing Spring autoconfig fails when app is using AnnotationConfigWebApplicationContext (CF-11)

 - Handle javaee (or other) namespace if present correctly for all Java based plugins.

Change-Id: I738b10fe02217c804defc92801d7021ca2c5d6bb
2012-05-14 13:40:11 -04:00
Jennifer Hickey 0766153826 Merge "Bump tests submodule pointer" 2012-05-14 16:36:43 +00:00
Anfernee Gui 748a3eeb5f [router] Use pidfile utils in vcap_common. Disable thin's signal to avoid swallowing signals.
Test plan:

- BVT passed
- Unit test passed
- Check the pidfile in bosh env

Change-Id: I0a087b84146c3e3d3f7ba586c04437c645bcad7a
2012-05-14 20:14:59 +08:00
Anfernee Gui cc5c6a9644 [router] Remove legacy statistics collecting code
Test plan:

- BVT passed
- Unit test passed

Change-Id: If5b7924fe2d64933b7100871e5e3a3883a170983
2012-05-14 20:14:38 +08:00
Bob Nugmanov 4f0fead3ee bump logging gem and point to git repo with a SHA ref
Change-Id: I75260c93f3f6bf977abe937280a1dbf5144d5059
2012-05-11 18:54:06 -07:00
mpage 2d1395c24d [CC] Remove redundant rm
Change-Id: Icba389b9258d737cf5635dca77d02c1256498426
2012-05-11 17:45:36 -07:00
Anfernee Gui 60c60f6a60 Merge "[dea] Include app_id in router register/unregister message" 2012-05-12 00:23:45 +00:00
Jennifer Hickey 2e48b5951f Bump tests submodule pointer
Change-Id: If7b7e11198e32fa6b97ba19c926371ddb002aceb
2012-05-11 17:01:09 -07:00
Jennifer Hickey bfc0e0765f Merge "Add Play Framework" 2012-05-11 23:19:49 +00:00
Jennifer Hickey 16169fa310 Add Play Framework
Change-Id: I57c11bcc01f4ce128f07678be334aa130d9b0460
2012-05-11 15:36:40 -07:00