Commit graph

15 commits

Author SHA1 Message Date
Steve Harris
d7a2004679 Merge branch 'ss_sync' (OB12.1.2) into 11-Collaboration
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
Added

Former-commit-id: cbade8ffea [formerly 0d2bd27a08] [formerly eca4aef9a8] [formerly cbade8ffea [formerly 0d2bd27a08] [formerly eca4aef9a8] [formerly e5a5b3eefa [formerly eca4aef9a8 [formerly d74a1285a30ce98a656668c93c71462e7dc51c2a]]]]
Former-commit-id: e5a5b3eefa
Former-commit-id: b0735040cb [formerly d879ca2f3f] [formerly 03e76106f4a88bef1ddb1ae9403d5f1806fc5958 [formerly ff6c744fa7]]
Former-commit-id: daf0c9b261bd1f2b5c85033755673b5f83ca3937 [formerly 2864659287]
Former-commit-id: cd66297c18
2012-02-20 14:02:14 -06:00
Bryan Kowal
3476936eac Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]]
Former-commit-id: 682c10767d
Former-commit-id: e326a29d2f [formerly cc8c6597a2] [formerly a057be46f691d8ed25cfea1a37709fd22cddecd5 [formerly 2ba23624b4]]
Former-commit-id: 177408d3d8058b38f3b908359601d7498ff2db8c [formerly 8403801a2b]
Former-commit-id: ce9165ce58
2012-02-17 12:17:14 -06:00
Steve Harris
8c9e581f41 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb]
Former-commit-id: 9a09879521
2012-02-17 10:55:02 -06:00
Steve Harris
44fcb44d45 Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: e21fc62dd9 [formerly 74c156e508] [formerly 5e47f8c33a] [formerly e21fc62dd9 [formerly 74c156e508] [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly 5e47f8c33a [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]]]
Former-commit-id: a91b01bfbe
Former-commit-id: 1d02286ab1 [formerly 98b223d08e] [formerly 4e98d4f2cb2afa20c737603123503ba7a42a68ea [formerly 39b13d7102]]
Former-commit-id: 202ae427973d5fcd9dad1196212f733362bbbc31 [formerly ad1f608967]
Former-commit-id: 79698247d7
2012-02-15 12:54:54 -06:00
Steve Harris
92ab5acb79 Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: 7ebc30c5dd [formerly ece695a374] [formerly 4eef9c3c20] [formerly 7ebc30c5dd [formerly ece695a374] [formerly 4eef9c3c20] [formerly 35cc62582b [formerly 4eef9c3c20 [formerly e019344c6f96c6db35ede5985779eab537df523c]]]]
Former-commit-id: 35cc62582b
Former-commit-id: 552601b5d6 [formerly c2603de1b8] [formerly 6933a99ae1c8013004495ce95ee7b333320d0db6 [formerly a6b95a2e81]]
Former-commit-id: aedbf0a4b9e14a76dd8cc638278464c7cb4d40ea [formerly b1bab03dcb]
Former-commit-id: a2cb228a73
2012-02-08 09:09:28 -06:00
Matt Nash
116c79c2f1 Issue #192 gitignore changes
Former-commit-id: ce6f4e409f [formerly 7d36323ae9] [formerly 5fdadf4333] [formerly ce6f4e409f [formerly 7d36323ae9] [formerly 5fdadf4333] [formerly 426da850d3 [formerly 5fdadf4333 [formerly 68f511221d4b198be50e1cf2a81723b8c3578a61]]]]
Former-commit-id: 426da850d3
Former-commit-id: a4cee49270 [formerly 203ec03a08] [formerly 6a7793fa54d4408e6d78ca96a150c3d2c752697d [formerly 380179f10d]]
Former-commit-id: 23e3a8a543907ead6c51e6bc9ab5122c1fd66c7e [formerly 1cde55048e]
Former-commit-id: 0777f62d50
2012-02-03 15:03:21 -06:00
Bryan Kowal
6beb1f62eb Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: da5e9f5bba [formerly c8dde3b1f6] [formerly f0b31d25f6] [formerly da5e9f5bba [formerly c8dde3b1f6] [formerly f0b31d25f6] [formerly 71d08b6916 [formerly f0b31d25f6 [formerly b309c8b3d2726da589a057d31d2ae7592b82eb19]]]]
Former-commit-id: 71d08b6916
Former-commit-id: 406c4ad5b3 [formerly ee70b7909c] [formerly 2b8ed7b794d5a320a8d0151eb8c6237c27c1f71a [formerly 1f254d0e0f]]
Former-commit-id: b53597bd7a0e265c15e91d4512e6483e971d7864 [formerly 9efacb47fe]
Former-commit-id: fd1af4b5ea
2012-01-26 17:38:17 -06:00
Matt Nash
3a62e25f80 Issue #192 remove cave directory from tools for ss_sync!!!!
Former-commit-id: 52f7908958 [formerly 752ff42041] [formerly 58f737b91d] [formerly 52f7908958 [formerly 752ff42041] [formerly 58f737b91d] [formerly 7f60d8ef33 [formerly 58f737b91d [formerly d1b8d74e4773ff4385304ca846a6f5c4fefec3c3]]]]
Former-commit-id: 7f60d8ef33
Former-commit-id: 894ebcea40 [formerly ec87ab4e3e] [formerly 08e75755c14dde7bfc05337105cd374635f3bd65 [formerly c19737f31d]]
Former-commit-id: 323fe3924101df02af952d60078d78a12c5b0c46 [formerly 83e1c70f0f]
Former-commit-id: 02d2771c85
2012-01-25 11:12:57 -06:00
Matt Nash
0eabe71dba Issue #192 remove cave directory under tools for 11
Former-commit-id: d3d3fbff49 [formerly 82e27e00d1] [formerly 243bf2ac7c] [formerly d3d3fbff49 [formerly 82e27e00d1] [formerly 243bf2ac7c] [formerly 6b938ecbff [formerly 243bf2ac7c [formerly a33e474e675224f9eaeed64245c40e7b149b50ea]]]]
Former-commit-id: 6b938ecbff
Former-commit-id: e75b4bb2ac [formerly 8735351967] [formerly 68abde3603a379dbe102756f04220cd3e1502200 [formerly 0020fbeab7]]
Former-commit-id: 4519145e83c1eb11dfae2ffd08224fcf3d245f0d [formerly 3199c4eb12]
Former-commit-id: 7e227712e2
2012-01-25 09:34:51 -06:00
Bryan Kowal
a89f0a64f0 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]]
Former-commit-id: ea1c82452b
Former-commit-id: 69f4822ad1 [formerly 9f6780c4dd] [formerly e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010]]
Former-commit-id: ed7bf459df1503ce7bd9500dc984c56a535b768f [formerly dafb6b18d8]
Former-commit-id: bb662ca175
2012-01-20 13:38:00 -06:00
Bryan Kowal
5609d47b35 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: 4c4fc64253 [formerly a1dbdff475] [formerly e24d39003e4489633c8f3c358cda877ba7831b9e [formerly 2a7b92ec91]]
Former-commit-id: 9e6a3f061015a2573aab1ed70eb6bcd887a1fb1a [formerly 3bcecdfe66]
Former-commit-id: 7afea63245
2012-01-20 11:37:38 -06:00
Matt Nash
52d1583604 remove files that were removed at some point
Former-commit-id: 02bb8004f8 [formerly 3189a44cb0] [formerly aec4a78b47] [formerly 02bb8004f8 [formerly 3189a44cb0] [formerly aec4a78b47] [formerly 88fc441c0f [formerly aec4a78b47 [formerly 952fab8cf1d3b86eba055cef96954a2807d6ecf6]]]]
Former-commit-id: 88fc441c0f
Former-commit-id: 418e6ed431 [formerly 8b9dd8c9c1] [formerly c68534675f454c2e9d3e8422b15ffce661cb9771 [formerly 68fc4dd901]]
Former-commit-id: 86ebb63c541d78c03e50e0b6b64c21e7c26e9c38 [formerly da7ff62e27]
Former-commit-id: 73cb8f4a37
2012-01-19 14:31:53 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
Bryan Kowal
5c81820a8a Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 9d64e1df12 [formerly 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]]
Former-commit-id: 9d64e1df12
Former-commit-id: f19cf1c4ee [formerly 281be5e0b7] [formerly 9ceb347a77 [formerly 06187b93be]]
Former-commit-id: 9ceb347a77
Former-commit-id: 5d92644c26
2012-01-18 16:00:45 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00