Commit graph

15 commits

Author SHA1 Message Date
Max Schenkelberg
f025c05d04 Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]
Former-commit-id: d1881ffa51
2013-07-15 14:26:15 -05:00
Richard Peter
46ee2f5dd7 Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]
Former-commit-id: be094a1745
2013-06-24 18:36:15 -05:00
Steve Harris
e1a5587dd0 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]
Former-commit-id: deebdb874a
2013-06-24 09:29:43 -04:00
Nate Jensen
ff64bf589b Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6

Former-commit-id: 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9]
Former-commit-id: afae330d8a
2013-06-19 10:16:06 -05:00
Steve Harris
43b7a9b410 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
2013-06-10 15:17:17 -04:00
Nate Jensen
fde771fa01 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]
Former-commit-id: fc691cbb2f
Former-commit-id: 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]
Former-commit-id: ab10e0072d
2013-05-29 16:19:28 -05:00
Nate Jensen
3a41ae85b4 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]
Former-commit-id: b025262dc1
2013-05-29 14:49:43 -05:00
Nate Jensen
3b56918970 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]
Former-commit-id: a84a6fe6ae
2013-05-23 11:20:40 -05:00
Nate Jensen
b8e6b1a083 Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]
Former-commit-id: 882296f823
2013-05-23 10:06:28 -05:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Steve Harris
3cb24c1d06 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
2012-11-07 12:41:20 -06:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00