Commit graph

4497 commits

Author SHA1 Message Date
Steve Harris
0be97d503a Merge branch 'development' into development_on_RHEL6
Former-commit-id: f25d638bc2 [formerly a103a0e8ac] [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: c51eafcb852c1a8282b6694b8e25e7101b5a76bb [formerly eced243e6a]
Former-commit-id: 3b29cf6790
2013-10-28 15:58:12 -05:00
Bryan Kowal
3e68d9aaac Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: 90a54524c6 [formerly df575b7be1] [formerly a6d7822698] [formerly cda8d04831 [formerly a6d7822698 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]
Former-commit-id: cda8d04831
Former-commit-id: 3fa0f0dac5587960c496629c316aa2a1a2f464bc [formerly cc0f6832c9]
Former-commit-id: 27d2e33769
2013-10-28 14:50:28 -05:00
Steve Harris
dd533f0bce Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]
Former-commit-id: 972339d60f
Former-commit-id: 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8]
Former-commit-id: a444c93ee7
2013-10-28 14:39:22 -05:00
Nate Jensen
7ac7a7ce3d Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]
Former-commit-id: f62f7dc851
Former-commit-id: 236fe4b18811523bce5e5090bd5f361fa56869a5 [formerly 87917f3548]
Former-commit-id: 9dc4378fc4
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
285a0af019 Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07

Former-commit-id: 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]
Former-commit-id: 5b439696df
Former-commit-id: ae5d9cd5f9d93524f8b356e1b865d0b7966eab25 [formerly 6866344496]
Former-commit-id: 54a39977f5
2013-10-28 13:16:23 -05:00
Ron Anderson
306a5d72f4 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]
Former-commit-id: 3575496955
2013-10-28 12:59:44 -05:00
Richard Peter
2fdae3f973 Merge "Issue #2249 availableTime now always return non-empty list." into omaha_13.5.3
Former-commit-id: 0473a8b587 [formerly 0c3de0a096] [formerly a6c98bc229] [formerly dbea005bd7 [formerly a6c98bc229 [formerly 67d7e4e67e0c9e00ca2a7492a1653e3777303a65]]]
Former-commit-id: dbea005bd7
Former-commit-id: cfe96e59828c3d24949f56a52e75fc956b05bca3 [formerly 4e4cbc2bfb]
Former-commit-id: 505ccfba12
2013-10-28 12:29:58 -05:00
Richard Peter
48267f510b Issue #2362: Fix merge issue
Former-commit-id: 89e5781b13 [formerly 6dba9925c3] [formerly 814b1878b2] [formerly 51bf66d456 [formerly 814b1878b2 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]]]
Former-commit-id: 51bf66d456
Former-commit-id: f75934ef7aeecb24bea0928dbfb67cd395fc700d [formerly 50bd787f24]
Former-commit-id: 4e5cd1b28b
2013-10-28 12:13:04 -05:00
Steve Harris
7de3535d64 14.1.1-5 baseline
Former-commit-id: 31eefc21cd [formerly 933e7395ac] [formerly 877776a04c] [formerly f4c53b02fa [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]
Former-commit-id: f4c53b02fa
Former-commit-id: ba0194dff6dd3d0a89190211a15a136f32ca0270 [formerly af2707389c]
Former-commit-id: 3b738baba8
2013-10-28 12:14:27 -04:00
Ben Steffensmeier
2400380daf Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]
Former-commit-id: 0e3cf8b47f
2013-10-28 10:14:08 -05:00
Steve Harris
2039d101ef 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly 20443a5d933e8268c1fb3f455df197a71fca1203 [formerly bd95bb6a4e]] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]
Former-commit-id: b60635cd70
2013-10-28 10:55:16 -04:00
Steve Harris
2d30611c6d 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]
Former-commit-id: aa59400b67
2013-10-28 10:46:02 -04:00
Nate Jensen
91c89ad6e6 Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly cda57ce742 [formerly ca2e057635 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]
Former-commit-id: cda57ce742
Former-commit-id: e024ea40dde60c244a0a5d34215ef2a3de55bd6d [formerly fad56e0c5f]
Former-commit-id: 4938d287fe
2013-10-28 09:31:28 -05:00
Steve Harris
2fbc08d837 13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]
Former-commit-id: 06f5dcf801
2013-10-28 10:30:57 -04:00
Nate Jensen
3cfbcbed91 Issue #2359 fix for extra long messages
Former-commit-id: ea89d218a8 [formerly e7763c0864] [formerly 665e224c75] [formerly 3abe5b9f18 [formerly 665e224c75 [formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]]
Former-commit-id: 3abe5b9f18
Former-commit-id: e27bb5daa3af459b5fe7294e0931b9bea19a9c01 [formerly 8ad85c297c]
Former-commit-id: 3d10b22fe1
2013-10-28 09:15:20 -05:00
Nate Jensen
fa1bd6b2a4 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]
Former-commit-id: 8aa02150c4
2013-10-28 09:07:04 -05:00
Nate Jensen
a2bf6fb3fb Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]
Former-commit-id: 15fbcd6984
Former-commit-id: a46bb24ed422dbd3fd41b66e023bd7c2d4fc36e7 [formerly 68a8dbe064]
Former-commit-id: e46c285eed
2013-10-28 09:05:01 -05:00
Nate Jensen
9bad4b9171 Merge "Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins." into development
Former-commit-id: 16ff44c65a [formerly 8ca435c9e7] [formerly 6dd1198fdf] [formerly 70421fd756 [formerly 6dd1198fdf [formerly d4adddcf9b5e860cb4976535a1b2309f8fd47783]]]
Former-commit-id: 70421fd756
Former-commit-id: 34578e1df0a1aa074fbfd89223d4580c3105e7c9 [formerly 1ed235de97]
Former-commit-id: 9e64c8d7a2
2013-10-28 09:04:12 -05:00
Ben Steffensmeier
694511af94 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]
Former-commit-id: 4eea088717
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
13829ffd04 Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly de02c88451a8ddfee21be1432313918cb2a173ac [formerly 88ad284e71]] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]
Former-commit-id: 3150d960e8
Former-commit-id: a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]
Former-commit-id: 237d947086
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
e03a1c1202 Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]
Former-commit-id: cac1f07cbb
Former-commit-id: cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6]
Former-commit-id: ce9653ab15
2013-10-25 15:31:39 -05:00
Ben Steffensmeier
ed7e75b748 Issue #2491 fix d2d xy bundles.
Former-commit-id: bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: abfcb4c0128db0fe3c621473959c887bb4552882 [formerly ddf45e1cf4]
Former-commit-id: 8248ea2b3b
2013-10-25 14:46:43 -05:00
Roger Ferrel
a8366bfc31 Issue #2249 availableTime now always return non-empty list.
Change-Id: Id0afee6e7673ff0eb062dc2deebacd89fece78ec

Former-commit-id: dea388b774 [formerly b12987b714] [formerly dc846b2f2c] [formerly 4528b03c70 [formerly dc846b2f2c [formerly d29c0635c08e75cb956cf415ffcdfacd53c53fd8]]]
Former-commit-id: 4528b03c70
Former-commit-id: 74b3ee81ce861235a91c4cc2dce5d557570f65b1 [formerly 4c61794a6f]
Former-commit-id: 550138a28a
2013-10-25 12:25:44 -05:00
Steve Harris
426b0662dc Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java

Former-commit-id: 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572]
Former-commit-id: 6aab62b7b9
2013-10-25 10:51:42 -05:00
Steve Harris
a2442a8e39 13.5.2-13 baseline
Former-commit-id: e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]
Former-commit-id: e7b1702032
Former-commit-id: 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b]
Former-commit-id: 96c50ba394
2013-10-25 10:06:56 -04:00
Steve Harris
2e6e031198 13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]
Former-commit-id: bcb531e671
Former-commit-id: 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]
Former-commit-id: 15d9848170
2013-10-25 09:59:15 -04:00
Steve Harris
a18eb8fe83 13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]
Former-commit-id: cbfde2f52a
Former-commit-id: 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]
Former-commit-id: ecad06c80d
2013-10-25 09:45:58 -04:00
Nate Jensen
7b789fed6f Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 2903ad6e2b [formerly 540d0ee576] [formerly c31a3d759d46cee14da8692723a482c162baf60f [formerly 5f457fbad6]] [formerly 68150f49ef [formerly 5f457fbad6 [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]]
Former-commit-id: 68150f49ef
Former-commit-id: 05df7516efbadb27700857f955931c8c7e2bf6fe [formerly 2002f94568]
Former-commit-id: 403ba0f9cb
2013-10-24 20:06:08 -05:00
Nate Jensen
264555b5d7 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]
Former-commit-id: 5a99163569
Former-commit-id: 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]
Former-commit-id: b511177fa1
2013-10-24 20:02:18 -05:00
Nate Jensen
e6e0942d70 Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]
Former-commit-id: b1244552e4
Former-commit-id: 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]
Former-commit-id: 3a1856b168
2013-10-24 19:52:13 -05:00
Nate Jensen
d21d7c5283 Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development
Former-commit-id: 5e54da3258 [formerly b2cdbd6fc5] [formerly 5d96feb00e] [formerly 298114500c [formerly 5d96feb00e [formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]]]
Former-commit-id: 298114500c
Former-commit-id: 251c8ae97f34417aa2812c59e32158d427e4285e [formerly fc1898234d]
Former-commit-id: 39e7b0fd95
2013-10-24 19:51:49 -05:00
Dave Hladky
e44f20606e Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]
Former-commit-id: 36d7c60914
Former-commit-id: 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]
Former-commit-id: db33e9cafa
2013-10-24 13:52:45 -05:00
Jonathan Sanchez
7e7e0c1b27 Issue #2496 Updated gfe spring files to support GFE grids in hazard services.
Change-Id: Icd58f77266a9e6c67c001badcdd1f7590640b162

Former-commit-id: 2c38de5fc5 [formerly c289f77965] [formerly ec2f7c8ce7] [formerly cb5ac5c835 [formerly ec2f7c8ce7 [formerly 0946721292171cc2d14b173a60c273731b73af12]]]
Former-commit-id: cb5ac5c835
Former-commit-id: 0d0f8c6a10f942e9061f2231cc9721b46526f419 [formerly 2420f1a231]
Former-commit-id: d8e14ca6e9
2013-10-24 12:22:02 -05:00
Benjamin Phillippe
1664af6b9d Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce

Former-commit-id: 9a8c43a777 [formerly 127b5a3b70] [formerly be09ba9fcf] [formerly 0905d6ffdd [formerly be09ba9fcf [formerly 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28]]]
Former-commit-id: 0905d6ffdd
Former-commit-id: df866e1f5581eb7f04abe632e8f4bbc1bb498f33 [formerly 041ce07803]
Former-commit-id: a169585a0a
2013-10-24 11:51:11 -05:00
Bryan Kowal
1e76925994 Merge branch 'development' into development_on_RHEL6
Former-commit-id: e72cf1aa46 [formerly 6e0737e65f] [formerly a7b85498ef] [formerly 49eed21398 [formerly a7b85498ef [formerly 1bfc1a0c02691dfe620909a8c551fa2a79c5a484]]]
Former-commit-id: 49eed21398
Former-commit-id: bb3214224b85612967ba09e2cd193a2dff2d5f0d [formerly 3c6f5cc08f]
Former-commit-id: e87a77d017
2013-10-24 11:32:04 -05:00
Ben Steffensmeier
3b4ae67ded Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 0c6ad2e7a6ad44d264169d56b0486e1f819a8499 [formerly d927e6b2d7]
Former-commit-id: 09a3276d51
2013-10-24 11:28:06 -05:00
Dave Hladky
60c57083ec Issue #2469 Refined deletion of adhoc subs.
Former-commit-id: f6763481a2 [formerly e02868bf2a] [formerly 988bb90523] [formerly 6b5543501a [formerly 988bb90523 [formerly f8d93b233f32623864f86edf822b77b68aa5e0a0]]]
Former-commit-id: 6b5543501a
Former-commit-id: 14b9d536bae75aa52c4b4574d3c9332befc403b5 [formerly 14ea0393a1]
Former-commit-id: 05c2ce9bc3
2013-10-24 09:32:41 -05:00
Brad Gonzales
1449b0270b Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs
on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box.

Amend: Added excludes to sbnSimulator modes.
       Updated FileUtil.listPaths to close the stream and use a LinkedList.
       Added additional logging to SbnSimulator.

Change-Id: I89ff7d4afdd18ba51b8fd4812bb0b871ffc6d3af

Former-commit-id: e4f3bcf7ee [formerly 5145ec3dfe] [formerly bd7e5d8940] [formerly f7a635ebef [formerly bd7e5d8940 [formerly f9e593974811896dec76c512c2a76b5769c7a68a]]]
Former-commit-id: f7a635ebef
Former-commit-id: c3d8e35cadd5927e79213f8c47d73c2feded21ff [formerly c36cbae577]
Former-commit-id: 88a20aeae1
2013-10-23 18:44:41 -05:00
Bryan Kowal
b17ec4bf91 Issue #2476 - re-compile 64-bit jep for RHEL6
Former-commit-id: d67bbce7f3 [formerly 069cb9645e] [formerly 4c3cdbb28e] [formerly 8036733372 [formerly 4c3cdbb28e [formerly f4fc8fb61073ffd0ed88e9ac5520d9b538481516]]]
Former-commit-id: 8036733372
Former-commit-id: 6cd578ca9adeb4f26edf6048fb0bcfdd512f81a2 [formerly 4bb993d6c3]
Former-commit-id: 43f23dbc5f
2013-10-23 17:12:02 -05:00
Richard Peter
ca392195cb Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
Former-commit-id: ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly b5072746fe [formerly 2220ce9aa3 [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]]
Former-commit-id: b5072746fe
Former-commit-id: c433dcb03f3a6c8f1b7988a97befddc483c4253f [formerly f71d65d257]
Former-commit-id: feb1655ae3
2013-10-23 16:57:28 -05:00
Richard Peter
330a333933 Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development
Former-commit-id: 6d62f99937 [formerly 859dd8272d] [formerly 5fc3956337] [formerly 1750224476 [formerly 5fc3956337 [formerly 381be8f02831002b29a8a90831b1c116d023c48f]]]
Former-commit-id: 1750224476
Former-commit-id: 2a01606c61164f3088d8d81dc3e051f71ec538b1 [formerly 383a774fad]
Former-commit-id: bf7a5b48b1
2013-10-23 16:53:22 -05:00
Richard Peter
a1eebaaf69 Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development
Former-commit-id: 3cd286ba60 [formerly 2e7836431e] [formerly 7ec76c0634] [formerly 6b4c675600 [formerly 7ec76c0634 [formerly 3054f3682a955395f381d3d9c78728c4a4492b69]]]
Former-commit-id: 6b4c675600
Former-commit-id: 97c05a8e322561ee200f9573a86e4869891f59bd [formerly 109474aec7]
Former-commit-id: 3843947a17
2013-10-23 16:41:57 -05:00
Richard Peter
337cf9ab3b Merge "Issue #1538 Reworked registry database connection strategy" into development
Former-commit-id: e79bc34c91 [formerly b6541dfb40] [formerly 58d4da8db6] [formerly ffb7a6e6ae [formerly 58d4da8db6 [formerly 2051ba7e62c8ba4fc953917bd0be72afbdacae76]]]
Former-commit-id: ffb7a6e6ae
Former-commit-id: 632e36362375d729c2d4dffa12a4dedf09c7fd15 [formerly 1b74f629f7]
Former-commit-id: a8f9146990
2013-10-23 16:33:29 -05:00
Roger Ferrel
50e00ff50a Issue #2478 Make database archive date format thread safe.
Change-Id: I0b864b5678ce60c88dfc6bb19857d97421a9e5f6

Former-commit-id: 6f62c2c226 [formerly 64b20ed2b3] [formerly 1551a51954] [formerly 65b11b22b4 [formerly 1551a51954 [formerly a33202aa75cc3ba5be71288c3dd49bb395535826]]]
Former-commit-id: 65b11b22b4
Former-commit-id: 6ca39d866e473596e1e69d707aa06c3d0413494a [formerly 613ae43736]
Former-commit-id: f809ada9c2
2013-10-23 16:23:50 -05:00
Ron Anderson
88f6e5d9d7 Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089

Former-commit-id: 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]
Former-commit-id: cc28fca175
Former-commit-id: 4b9ce7666378daf235ca6c2275644a5d5cc7407a [formerly 20fcbd322e]
Former-commit-id: 0d9df14596
2013-10-23 16:02:40 -05:00
Nate Jensen
f15933f483 Merge "Issue #2361 remove dependencies on mesowest and delete dead grichardson code" into development
Former-commit-id: 60e33eb620 [formerly 12b3aea7bf] [formerly 334e1d4da7] [formerly dc11d7be9e [formerly 334e1d4da7 [formerly 1c3b27e873403cd9a78d3ef38948ba41511cbebd]]]
Former-commit-id: dc11d7be9e
Former-commit-id: affeb0449ca65cd8307015ce23eb461db2a0c16d [formerly 5e4985d6fa]
Former-commit-id: b09296f045
2013-10-23 15:58:44 -05:00
Richard Peter
b29e037e05 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: 9b5d2fa69f [formerly f69bbf7952] [formerly cb33f5ada7] [formerly 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]
Former-commit-id: 14d5b8656e
Former-commit-id: e43a9bab4c68a481f2c9959d56447b4b556d21ba [formerly 6ecb80e892]
Former-commit-id: a49c67203e
2013-10-23 15:50:25 -05:00
Bryan Kowal
18a835700a Issue #2476 - recompiled Jep for Windows
Former-commit-id: 554b8ed515 [formerly 243ffb4b93] [formerly 0e1c5b51ba] [formerly 79f2f2694f [formerly 0e1c5b51ba [formerly 408bf5a265f558f22d86295e2c541166868d8d1b]]]
Former-commit-id: 79f2f2694f
Former-commit-id: 58afb6492c43f13934558f37ad7c83bc33ab527c [formerly 1737a11d53]
Former-commit-id: 752061e05f
2013-10-23 15:12:42 -05:00
Bryan Kowal
3bd099e334 Issue #2476 - recompiled jep for Linux
Former-commit-id: 3cecffdc41 [formerly 701b9de382] [formerly a3cfae3510] [formerly 9fe5429068 [formerly a3cfae3510 [formerly b33a29abbb89d392b7bba2862db4b3d06b2c24a5]]]
Former-commit-id: 9fe5429068
Former-commit-id: 9f7f22be22f7dce0a7d746d3dcc5083e9a47ffea [formerly 46f5db6284]
Former-commit-id: 855abcd044
2013-10-23 15:12:42 -05:00
Nate Jensen
d2af0d52a6 Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]
Former-commit-id: 2f79b34a77
Former-commit-id: a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]
Former-commit-id: 2419a99ac7
2013-10-23 14:52:29 -05:00