Richard Peter
5ee9b1ce9d
Merge "Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box." into development
...
Former-commit-id: bfc87a0607
[formerly fe45d2b7e6
] [formerly bfc87a0607
[formerly fe45d2b7e6
] [formerly b6ffed0066
[formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]
Former-commit-id: b6ffed0066
Former-commit-id: 5baa99e9c9
[formerly 4765eaefad
]
Former-commit-id: f1d5148c49
2013-10-29 12:15:35 -05:00
Bryan Kowal
fba7e48970
Issue #2268 - fix CAVE installation error
...
Former-commit-id: 203c5d7288
[formerly 7772aca092
] [formerly 203c5d7288
[formerly 7772aca092
] [formerly 5bc115c56c
[formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]]]
Former-commit-id: 5bc115c56c
Former-commit-id: a89499f399
[formerly a34d7b254f
]
Former-commit-id: 893a2cf334
2013-10-29 11:44:48 -05:00
Ben Steffensmeier
f7f75c86da
Issue #2489 Fix SfcObs NPE.
...
Former-commit-id: 59d8afc639
[formerly f9ee49fac5
] [formerly 59d8afc639
[formerly f9ee49fac5
] [formerly ddf506ceac
[formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]]
Former-commit-id: ddf506ceac
Former-commit-id: 32427d8b3d
[formerly ca5a125829
]
Former-commit-id: bab495ab35
2013-10-29 10:59:36 -05:00
Steve Harris
8982d892ba
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: a103a0e8ac
[formerly 560b0075cd
] [formerly a103a0e8ac
[formerly 560b0075cd
] [formerly 6ea4ac62ed
[formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: 3b29cf6790
[formerly eced243e6a
]
Former-commit-id: 75cdf331b6
2013-10-28 15:58:12 -05:00
Bryan Kowal
819cb0bcb7
Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
...
Former-commit-id: df575b7be1
[formerly a6d7822698
] [formerly df575b7be1
[formerly a6d7822698
] [formerly cda8d04831
[formerly 06a166ef6c963585eb65da223610a21665f9545a]]]
Former-commit-id: cda8d04831
Former-commit-id: 27d2e33769
[formerly cc0f6832c9
]
Former-commit-id: 2615ad7324
2013-10-28 14:50:28 -05:00
Steve Harris
f49a22bae2
Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
...
Former-commit-id: f04be86698
[formerly 602f138493
] [formerly f04be86698
[formerly 602f138493
] [formerly 972339d60f
[formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]
Former-commit-id: 972339d60f
Former-commit-id: a444c93ee7
[formerly 4c0599bae8
]
Former-commit-id: 0bf9020c49
2013-10-28 14:39:22 -05:00
Nate Jensen
b2072949f9
Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
...
Former-commit-id: 4cd0b3fed7
[formerly ac65672cb2
] [formerly 4cd0b3fed7
[formerly ac65672cb2
] [formerly f62f7dc851
[formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]
Former-commit-id: f62f7dc851
Former-commit-id: 9dc4378fc4
[formerly 87917f3548
]
Former-commit-id: 98118ccced
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
c0ba7d0acc
Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
...
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07
Former-commit-id: 4e86bb8e5f
[formerly 65522e83c9
] [formerly 4e86bb8e5f
[formerly 65522e83c9
] [formerly 5b439696df
[formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]
Former-commit-id: 5b439696df
Former-commit-id: 54a39977f5
[formerly 6866344496
]
Former-commit-id: e3e621660f
2013-10-28 13:16:23 -05:00
Ron Anderson
643624f1a9
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
...
Former-commit-id: dd3ef2844c
[formerly fa5b6dce02
] [formerly dd3ef2844c
[formerly fa5b6dce02
] [formerly f2cfc0c686
[formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 3575496955
[formerly dda2eb89c1
]
Former-commit-id: 1daa0f8649
2013-10-28 12:59:44 -05:00
Richard Peter
76ff1ef0a8
Merge "Issue #2249 availableTime now always return non-empty list." into omaha_13.5.3
...
Former-commit-id: 0c3de0a096
[formerly a6c98bc229
] [formerly 0c3de0a096
[formerly a6c98bc229
] [formerly dbea005bd7
[formerly 67d7e4e67e0c9e00ca2a7492a1653e3777303a65]]]
Former-commit-id: dbea005bd7
Former-commit-id: 505ccfba12
[formerly 4e4cbc2bfb
]
Former-commit-id: a78c48a4ab
2013-10-28 12:29:58 -05:00
Richard Peter
0ce889ecf2
Issue #2362 : Fix merge issue
...
Former-commit-id: 6dba9925c3
[formerly 814b1878b2
] [formerly 6dba9925c3
[formerly 814b1878b2
] [formerly 51bf66d456
[formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]]]
Former-commit-id: 51bf66d456
Former-commit-id: 4e5cd1b28b
[formerly 50bd787f24
]
Former-commit-id: 934f346afb
2013-10-28 12:13:04 -05:00
Steve Harris
09eee9a31a
14.1.1-5 baseline
...
Former-commit-id: 933e7395ac
[formerly 877776a04c
] [formerly 933e7395ac
[formerly 877776a04c
] [formerly f4c53b02fa
[formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]
Former-commit-id: f4c53b02fa
Former-commit-id: 3b738baba8
[formerly af2707389c
]
Former-commit-id: 92851705fc
2013-10-28 12:14:27 -04:00
Ben Steffensmeier
47d3fb8249
Issue #2491 Fix alertviz and java 6 compatibility.
...
Former-commit-id: 0c66089721
[formerly 27165cea30
] [formerly 0c66089721
[formerly 27165cea30
] [formerly 44a6f05986
[formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 0e3cf8b47f
[formerly 1f33a1997e
]
Former-commit-id: 0c3bb6ef3e
2013-10-28 10:14:08 -05:00
Steve Harris
da4589ec2b
14.1.1-4 baseline
...
Former-commit-id: 82dec19b6a
[formerly bd95bb6a4e
] [formerly 82dec19b6a
[formerly bd95bb6a4e
] [formerly 99e3707c5b
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70
[formerly 7590a56e0e
]
Former-commit-id: 98ae84da42
2013-10-28 10:55:16 -04:00
Steve Harris
472c0a1a5e
14.1.1-3 baseline
...
Former-commit-id: 851f9df229
[formerly 94f24e0d8a
] [formerly 851f9df229
[formerly 94f24e0d8a
] [formerly 5739b4f832
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67
[formerly 4a6a209aea
]
Former-commit-id: 8d67ffede4
2013-10-28 10:46:02 -04:00
Nate Jensen
5d8c27a87a
Merge "Issue #2491 fix d2d xy bundles." into development
...
Former-commit-id: b8d194e4cd
[formerly ca2e057635
] [formerly b8d194e4cd
[formerly ca2e057635
] [formerly cda57ce742
[formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]
Former-commit-id: cda57ce742
Former-commit-id: 4938d287fe
[formerly fad56e0c5f
]
Former-commit-id: b48d5d53c3
2013-10-28 09:31:28 -05:00
Steve Harris
0e99e713e6
13.5.3-1 baseline
...
Former-commit-id: 059083170d
[formerly 1d8a2026f6
] [formerly 059083170d
[formerly 1d8a2026f6
] [formerly 30f65c2858
[formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]
Former-commit-id: 30f65c2858
Former-commit-id: 06f5dcf801
[formerly 9df3027bf0
]
Former-commit-id: 43610e510c
2013-10-28 10:30:57 -04:00
Nate Jensen
91cb555abd
Issue #2359 fix for extra long messages
...
Former-commit-id: e7763c0864
[formerly 665e224c75
] [formerly e7763c0864
[formerly 665e224c75
] [formerly 3abe5b9f18
[formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]]
Former-commit-id: 3abe5b9f18
Former-commit-id: 3d10b22fe1
[formerly 8ad85c297c
]
Former-commit-id: e96edbb80a
2013-10-28 09:15:20 -05:00
Nate Jensen
8feeb6be16
Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
...
Former-commit-id: 13eafc05c2
[formerly 4b19d287ea
] [formerly 13eafc05c2
[formerly 4b19d287ea
] [formerly e4aa2b8a94
[formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: 8aa02150c4
[formerly aa0e2ca80a
]
Former-commit-id: 2741cb4348
2013-10-28 09:07:04 -05:00
Nate Jensen
80e84760aa
Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
...
Former-commit-id: f98764cfb6
[formerly 5840b34e67
] [formerly f98764cfb6
[formerly 5840b34e67
] [formerly 15fbcd6984
[formerly 9d43ad381967fff847f33025461a31bb31816819]]]
Former-commit-id: 15fbcd6984
Former-commit-id: e46c285eed
[formerly 68a8dbe064
]
Former-commit-id: 6dcd593f32
2013-10-28 09:05:01 -05:00
Nate Jensen
f9f35fbc77
Merge "Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins." into development
...
Former-commit-id: 8ca435c9e7
[formerly 6dd1198fdf
] [formerly 8ca435c9e7
[formerly 6dd1198fdf
] [formerly 70421fd756
[formerly d4adddcf9b5e860cb4976535a1b2309f8fd47783]]]
Former-commit-id: 70421fd756
Former-commit-id: 9e64c8d7a2
[formerly 1ed235de97
]
Former-commit-id: b4ba3c1aa4
2013-10-28 09:04:12 -05:00
Ben Steffensmeier
ddd58aa99c
Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
...
Former-commit-id: 3b68ce8d72
[formerly 2a83b45f93
] [formerly 3b68ce8d72
[formerly 2a83b45f93
] [formerly 4c03fc93f1
[formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 4eea088717
[formerly fbdcadb456
]
Former-commit-id: 5645da0b45
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
5e0fc1b98a
Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
...
Former-commit-id: a629f974a5
[formerly 88ad284e71
] [formerly a629f974a5
[formerly 88ad284e71
] [formerly 3150d960e8
[formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]
Former-commit-id: 3150d960e8
Former-commit-id: 237d947086
[formerly 4311d8ea4c
]
Former-commit-id: 39768a50c1
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
7f38aac48c
Issue #2491 Remove uneeded ISerializableObject files.
...
Former-commit-id: f34bfc1e5b
[formerly c14cc609a8
] [formerly f34bfc1e5b
[formerly c14cc609a8
] [formerly cac1f07cbb
[formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]
Former-commit-id: cac1f07cbb
Former-commit-id: ce9653ab15
[formerly a06bdc56d6
]
Former-commit-id: 3955ac729f
2013-10-25 15:31:39 -05:00
Ben Steffensmeier
0fd0580788
Issue #2491 fix d2d xy bundles.
...
Former-commit-id: 9922b11f75
[formerly 5b6e32f47e
] [formerly 9922b11f75
[formerly 5b6e32f47e
] [formerly 86ba5b9f09
[formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: 8248ea2b3b
[formerly ddf45e1cf4
]
Former-commit-id: 7272087374
2013-10-25 14:46:43 -05:00
Roger Ferrel
dfdf7e6df3
Issue #2249 availableTime now always return non-empty list.
...
Change-Id: Id0afee6e7673ff0eb062dc2deebacd89fece78ec
Former-commit-id: b12987b714
[formerly dc846b2f2c
] [formerly b12987b714
[formerly dc846b2f2c
] [formerly 4528b03c70
[formerly d29c0635c08e75cb956cf415ffcdfacd53c53fd8]]]
Former-commit-id: 4528b03c70
Former-commit-id: 550138a28a
[formerly 4c61794a6f
]
Former-commit-id: 3a5f91793d
2013-10-25 12:25:44 -05:00
Steve Harris
2864f20285
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: 64062fa355
[formerly 702b66ee52
] [formerly 64062fa355
[formerly 702b66ee52
] [formerly ca54ffaad1
[formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 6aab62b7b9
[formerly 38e4e0c572
]
Former-commit-id: 3a2a83bc4b
2013-10-25 10:51:42 -05:00
Steve Harris
c71631dd28
13.5.2-13 baseline
...
Former-commit-id: ba50a26e70
[formerly 2100a15013
] [formerly ba50a26e70
[formerly 2100a15013
] [formerly e7b1702032
[formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]
Former-commit-id: e7b1702032
Former-commit-id: 96c50ba394
[formerly bc3eff506b
]
Former-commit-id: 6bff2d159f
2013-10-25 10:06:56 -04:00
Steve Harris
f97c128cc8
13.5.2-12 baseline
...
Former-commit-id: e2b9baf2ed
[formerly a532896473
] [formerly e2b9baf2ed
[formerly a532896473
] [formerly bcb531e671
[formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]
Former-commit-id: bcb531e671
Former-commit-id: 15d9848170
[formerly b70ec5732d
]
Former-commit-id: 248e79aa2f
2013-10-25 09:59:15 -04:00
Steve Harris
d63a07d248
13.5.2-11 baseline
...
Former-commit-id: 9215a213a1
[formerly b820a28276
] [formerly 9215a213a1
[formerly b820a28276
] [formerly cbfde2f52a
[formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]
Former-commit-id: cbfde2f52a
Former-commit-id: ecad06c80d
[formerly c1473d8a72
]
Former-commit-id: 49b1168f5e
2013-10-25 09:45:58 -04:00
Nate Jensen
8cb574a419
Issue #2361 remove ISerializableObject from harvester plugin
...
Former-commit-id: 540d0ee576
[formerly 5f457fbad6
] [formerly 540d0ee576
[formerly 5f457fbad6
] [formerly 68150f49ef
[formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]]
Former-commit-id: 68150f49ef
Former-commit-id: 403ba0f9cb
[formerly 2002f94568
]
Former-commit-id: c2f1e3f838
2013-10-24 20:06:08 -05:00
Nate Jensen
213478f84b
Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
...
Former-commit-id: 3a453d5442
[formerly 002005139f
] [formerly 3a453d5442
[formerly 002005139f
] [formerly 5a99163569
[formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]
Former-commit-id: 5a99163569
Former-commit-id: b511177fa1
[formerly cf63b37257
]
Former-commit-id: c4161d09ba
2013-10-24 20:02:18 -05:00
Nate Jensen
9dc852ba9c
Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
...
Former-commit-id: 408ea200fc
[formerly b17fc59a5a
] [formerly 408ea200fc
[formerly b17fc59a5a
] [formerly b1244552e4
[formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]
Former-commit-id: b1244552e4
Former-commit-id: 3a1856b168
[formerly 803c9a8217
]
Former-commit-id: 9b582b0d83
2013-10-24 19:52:13 -05:00
Nate Jensen
f73752af0e
Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development
...
Former-commit-id: b2cdbd6fc5
[formerly 5d96feb00e
] [formerly b2cdbd6fc5
[formerly 5d96feb00e
] [formerly 298114500c
[formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]]]
Former-commit-id: 298114500c
Former-commit-id: 39e7b0fd95
[formerly fc1898234d
]
Former-commit-id: 797002f959
2013-10-24 19:51:49 -05:00
Dave Hladky
7f8ff13d44
Issue #2484 Added originatingSite to id for Subscription registry objects.
...
Former-commit-id: 577e2b84e9
[formerly 3c33f6e5ea
] [formerly 577e2b84e9
[formerly 3c33f6e5ea
] [formerly 36d7c60914
[formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]
Former-commit-id: 36d7c60914
Former-commit-id: db33e9cafa
[formerly 2b5ffeab74
]
Former-commit-id: 916f035c87
2013-10-24 13:52:45 -05:00
Jonathan Sanchez
61af6aaa1d
Issue #2496 Updated gfe spring files to support GFE grids in hazard services.
...
Change-Id: Icd58f77266a9e6c67c001badcdd1f7590640b162
Former-commit-id: c289f77965
[formerly ec2f7c8ce7
] [formerly c289f77965
[formerly ec2f7c8ce7
] [formerly cb5ac5c835
[formerly 0946721292171cc2d14b173a60c273731b73af12]]]
Former-commit-id: cb5ac5c835
Former-commit-id: d8e14ca6e9
[formerly 2420f1a231
]
Former-commit-id: 4586b85ef6
2013-10-24 12:22:02 -05:00
Benjamin Phillippe
9cc9dc3e9c
Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager
...
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce
Former-commit-id: 127b5a3b70
[formerly be09ba9fcf
] [formerly 127b5a3b70
[formerly be09ba9fcf
] [formerly 0905d6ffdd
[formerly 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28]]]
Former-commit-id: 0905d6ffdd
Former-commit-id: a169585a0a
[formerly 041ce07803
]
Former-commit-id: d938f48197
2013-10-24 11:51:11 -05:00
Bryan Kowal
347c233443
Merge branch 'development' into development_on_RHEL6
...
Former-commit-id: 6e0737e65f
[formerly a7b85498ef
] [formerly 6e0737e65f
[formerly a7b85498ef
] [formerly 49eed21398
[formerly 1bfc1a0c02691dfe620909a8c551fa2a79c5a484]]]
Former-commit-id: 49eed21398
Former-commit-id: e87a77d017
[formerly 3c6f5cc08f
]
Former-commit-id: 6f5e6888cb
2013-10-24 11:32:04 -05:00
Ben Steffensmeier
d1d057ae57
Issue #2491 Use reflections to build Procedure JAXB context.
...
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b
Former-commit-id: a935ffadf7
[formerly bfc3faf08f
] [formerly a935ffadf7
[formerly bfc3faf08f
] [formerly fa0a0619bc
[formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 09a3276d51
[formerly d927e6b2d7
]
Former-commit-id: 5971562d1a
2013-10-24 11:28:06 -05:00
Dave Hladky
627dd4f2db
Issue #2469 Refined deletion of adhoc subs.
...
Former-commit-id: e02868bf2a
[formerly 988bb90523
] [formerly e02868bf2a
[formerly 988bb90523
] [formerly 6b5543501a
[formerly f8d93b233f32623864f86edf822b77b68aa5e0a0]]]
Former-commit-id: 6b5543501a
Former-commit-id: 05c2ce9bc3
[formerly 14ea0393a1
]
Former-commit-id: c552f899e3
2013-10-24 09:32:41 -05:00
Brad Gonzales
3ad2195c50
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: 5145ec3dfe
[formerly bd7e5d8940
] [formerly 5145ec3dfe
[formerly bd7e5d8940
] [formerly f7a635ebef
[formerly f9e593974811896dec76c512c2a76b5769c7a68a]]]
Former-commit-id: f7a635ebef
Former-commit-id: 88a20aeae1
[formerly c36cbae577
]
Former-commit-id: 9215426279
2013-10-23 18:44:41 -05:00
Bryan Kowal
25c863d914
Issue #2476 - re-compile 64-bit jep for RHEL6
...
Former-commit-id: 069cb9645e
[formerly 4c3cdbb28e
] [formerly 069cb9645e
[formerly 4c3cdbb28e
] [formerly 8036733372
[formerly f4fc8fb61073ffd0ed88e9ac5520d9b538481516]]]
Former-commit-id: 8036733372
Former-commit-id: 43f23dbc5f
[formerly 4bb993d6c3
]
Former-commit-id: b3a3b98654
2013-10-23 17:12:02 -05:00
Richard Peter
25e3b7e114
Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
...
Former-commit-id: 32131b3b27
[formerly 2220ce9aa3
] [formerly 32131b3b27
[formerly 2220ce9aa3
] [formerly b5072746fe
[formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]]
Former-commit-id: b5072746fe
Former-commit-id: feb1655ae3
[formerly f71d65d257
]
Former-commit-id: ea9b5e6c4a
2013-10-23 16:57:28 -05:00
Richard Peter
e6751dfe4d
Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development
...
Former-commit-id: 859dd8272d
[formerly 5fc3956337
] [formerly 859dd8272d
[formerly 5fc3956337
] [formerly 1750224476
[formerly 381be8f02831002b29a8a90831b1c116d023c48f]]]
Former-commit-id: 1750224476
Former-commit-id: bf7a5b48b1
[formerly 383a774fad
]
Former-commit-id: 7c9a2c614c
2013-10-23 16:53:22 -05:00
Richard Peter
6a8ab9eacc
Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development
...
Former-commit-id: 2e7836431e
[formerly 7ec76c0634
] [formerly 2e7836431e
[formerly 7ec76c0634
] [formerly 6b4c675600
[formerly 3054f3682a955395f381d3d9c78728c4a4492b69]]]
Former-commit-id: 6b4c675600
Former-commit-id: 3843947a17
[formerly 109474aec7
]
Former-commit-id: 58cb0638dc
2013-10-23 16:41:57 -05:00
Richard Peter
8ebc9c6523
Merge "Issue #1538 Reworked registry database connection strategy" into development
...
Former-commit-id: b6541dfb40
[formerly 58d4da8db6
] [formerly b6541dfb40
[formerly 58d4da8db6
] [formerly ffb7a6e6ae
[formerly 2051ba7e62c8ba4fc953917bd0be72afbdacae76]]]
Former-commit-id: ffb7a6e6ae
Former-commit-id: a8f9146990
[formerly 1b74f629f7
]
Former-commit-id: f7c66ea100
2013-10-23 16:33:29 -05:00
Roger Ferrel
7ab2a18fc0
Issue #2478 Make database archive date format thread safe.
...
Change-Id: I0b864b5678ce60c88dfc6bb19857d97421a9e5f6
Former-commit-id: 64b20ed2b3
[formerly 1551a51954
] [formerly 64b20ed2b3
[formerly 1551a51954
] [formerly 65b11b22b4
[formerly a33202aa75cc3ba5be71288c3dd49bb395535826]]]
Former-commit-id: 65b11b22b4
Former-commit-id: f809ada9c2
[formerly 613ae43736
]
Former-commit-id: ab39213204
2013-10-23 16:23:50 -05:00
Ron Anderson
ee845f3634
Issue #2446 Added cluster lock and check for purgeable data to publish.
...
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089
Former-commit-id: 680ba97826
[formerly 002bb6ab89
] [formerly 680ba97826
[formerly 002bb6ab89
] [formerly cc28fca175
[formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]
Former-commit-id: cc28fca175
Former-commit-id: 0d9df14596
[formerly 20fcbd322e
]
Former-commit-id: b9c5d96961
2013-10-23 16:02:40 -05:00
Nate Jensen
cf8083e0d1
Merge "Issue #2361 remove dependencies on mesowest and delete dead grichardson code" into development
...
Former-commit-id: 12b3aea7bf
[formerly 334e1d4da7
] [formerly 12b3aea7bf
[formerly 334e1d4da7
] [formerly dc11d7be9e
[formerly 1c3b27e873403cd9a78d3ef38948ba41511cbebd]]]
Former-commit-id: dc11d7be9e
Former-commit-id: b09296f045
[formerly 5e4985d6fa
]
Former-commit-id: e20d761603
2013-10-23 15:58:44 -05:00
Richard Peter
9b381e593d
Merge branch 'development' into development_on_RHEL6
...
Conflicts:
cots/org.jep.linux64/libjep.so
Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d
Former-commit-id: f69bbf7952
[formerly cb33f5ada7
] [formerly f69bbf7952
[formerly cb33f5ada7
] [formerly 14d5b8656e
[formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]
Former-commit-id: 14d5b8656e
Former-commit-id: a49c67203e
[formerly 6ecb80e892
]
Former-commit-id: e27a298e62
2013-10-23 15:50:25 -05:00