Nate Jensen
70035635ec
Merge "Issue #2620 Reordered developer feature.xml to match p2-build.xml" into development
...
Former-commit-id: 10b6341adb02f7b23f72aba4acf355bd44fec4ebaba4acf355bd44fec4eb708c77878f4b9411854e
2014-01-13 09:33:26 -06:00
Mike Duff
e395071beb
Issue #2636 - Removed apache Equals and Hashcode builder, using eclipse generated versions.
...
Former-commit-id: c6f92e92072a1f84b72d92b404f6ec9e817de4a992b404f6ec9e817de4a9fc3dec0591850ee18fd4
2014-01-13 09:25:34 -06:00
Brad Gonzales
6868d8d12d
Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
...
RecurringSubscription. Add environment configuration files to unit tests setup. Changed the
devRegistry debug port to the same port as registry.
Amend: Updates from peer review.
Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a
Former-commit-id: 2c0c6fbcc78eeb3dc4124537513df7343a2495e54537513df7343a2495e54049af9630f57529be9b
2014-01-10 16:37:09 -06:00
Richard Peter
1e10acc664
Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
...
Former-commit-id: 434c05b458bc4ad18fe97bbefddcc1e6d7acb6097bbefddcc1e6d7acb609527408ddd45b687c7bd5
2014-01-10 15:42:48 -06:00
Richard Peter
3ba91590bc
Merge "Issue #2642 - Update header comment" into omaha_14.2.1
...
Former-commit-id: 36feeef9409e0827e8b07976713662e841723f1c7976713662e841723f1cf3c30e73691d4a0ae816
2014-01-10 15:42:24 -06:00
Richard Peter
b3059957bc
Merge "Issue #2636 - change log statements, add missing copyright headers" into omaha_14.2.1
...
Former-commit-id: 550b40a4bf60f22e2d4c48184fe69551c8919ea748184fe69551c8919ea7cf2c9c530cb15476b43e
2014-01-10 15:42:08 -06:00
Richard Peter
acd5ef7973
Merge "Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean" into omaha_14.2.1
...
Former-commit-id: 3d4ee9f0a344f02d072e2580f289e9757e8d2c4b2580f289e9757e8d2c4bb1a2d3183f9cfb816557
2014-01-10 15:41:28 -06:00
Ron Anderson
2e9d07a0cf
Issue #2044 Fix some error handling in GFE to eliminate exceptions in edex logs.
...
Change-Id: Iad8edf92318d6c9277648396ba450a3fc6eb5c5a
Former-commit-id: 41354cddf77cae1b981d89f07fe9321c520b8cd189f07fe9321c520b8cd1bbac6df77d9df631248d
2014-01-10 15:01:10 -06:00
Brian Clements
42e259b83c
Issue #2594 made heap status monitor default on launch
...
Former-commit-id: 3333d3b9264f37164fc56ba1eb0edb4a62eb90dc6ba1eb0edb4a62eb90dc3d196a00ddcde78c4006
2014-01-10 14:54:14 -06:00
Ron Anderson
ab5ab0ebe3
Merge "Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic." into omaha_14.2.1
...
Former-commit-id: dacdddf40390a2c83c8eb8a33ecdf841b081307cb8a33ecdf841b081307ca35a46de1b76965c12dd
2014-01-10 13:29:59 -06:00
Ron Anderson
7b369af525
Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic.
...
Change-Id: I503cf82ce896e8cdf39c238eda0f31453d8510a5
Former-commit-id: 4e479cf9bd17ed8a6e753017260991d80ce4a19e3017260991d80ce4a19e57d3503ed6d70701cc6e
2014-01-10 13:17:44 -06:00
Mike Duff
6440aa8375
Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
...
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034
Former-commit-id: 696003d46326e34bb4d1b50ea7b162744d7367dcb50ea7b162744d7367dc0e5332e8cd3274c591bf
2014-01-10 12:14:27 -06:00
Mike Duff
c8885b34f1
Issue #2452 - Add label stating all lat/lons will be converted to easting.
...
Former-commit-id: 2e6173b61967f631135469ca0dd0d27081c2682369ca0dd0d27081c2682317d19cc0bbb616f34af2
2014-01-10 12:05:30 -06:00
Nate Jensen
fa5ed0fd00
Merge "Issue #2647 Fix window focus problems." into development
...
Former-commit-id: ad445b75d895181d092e5e1dfbf0f82a06693b3e5e1dfbf0f82a06693b3e7ad41f6958d41877f6fe
2014-01-10 11:14:53 -06:00
Mike Duff
5f19ccc46e
Issue #2642 - Update header comment
...
Former-commit-id: b70c96297f5d669a97af101d9939d628114764a5101d9939d628114764a57d25b33cb612c47ea375
2014-01-10 10:57:18 -06:00
Mike Duff
ae88e49e26
Issue #2636 - change log statements, add missing copyright headers
...
Former-commit-id: 8fe7d83f6f8993103c4512a8618c423be3a8ac0d12a8618c423be3a8ac0de121eb5dbdea07460e3e
2014-01-10 10:55:17 -06:00
Max Schenkelberg
6fa1f6cc12
Issue #2620 Reordered developer feature.xml to match p2-build.xml
...
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67
Former-commit-id: a3495d01dc13172879fdae7eb3938073c022da20ae7eb3938073c022da208abc1ec61159586b673b
2014-01-10 10:39:07 -06:00
Nate Jensen
1139a316ae
Merge "Issue #1998 fixed NPE in PointDataPluginDao" into development
...
Former-commit-id: 94c337083341a20fbd0021114964fa32909203d021114964fa32909203d030d01ec8ba9e696b1257
2014-01-10 08:58:03 -06:00
Nate Jensen
e63bac199d
Issue #2359 log exceptions in FFTI processing
...
Change-Id: Iec1c743352187de071f4b9840f1672bff531ba94
Former-commit-id: 8a469f686a1d9229a4a6d289eb1b5543b75928e4d289eb1b5543b75928e4daba59930d8b5ce7c07f
2014-01-10 08:57:18 -06:00
Richard Peter
a25ad86347
Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
...
Former-commit-id: 102bbe3e15b37d6e9c918ca1217f0352850fe95a8ca1217f0352850fe95a690f1b15ddb833c4333c
2014-01-09 16:58:39 -06:00
Richard Peter
5cf3d3349c
Merge "Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches" into omaha_14.2.1
...
Former-commit-id: 6227cb9e3cc32d55f3fc36ed029f0a0f3175bd7736ed029f0a0f3175bd77c95d31056878313bec85
2014-01-09 16:58:31 -06:00
Richard Peter
a2eef48cfb
Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
...
Former-commit-id: a39f2bff200bd52b65e7b711c35c68f45a281935b711c35c68f45a2819350459cd237ef4108b8be2
2014-01-09 16:53:52 -06:00
Ben Steffensmeier
05ebc3eece
Issue #2647 Fix window focus problems.
...
Former-commit-id: eebab1d33f13da8899de2b9e9a41db488d5e45b12b9e9a41db488d5e45b10ada0c6d3f1aa018e5b7
2014-01-09 15:14:38 -06:00
Brian Clements
7d7ce21036
Issue #1998 fixed NPE in PointDataPluginDao
...
StorageStatus was not being checked after operation
Former-commit-id: 9686c8fab1f0c1b109f8401cd813f11e6ae5a98e401cd813f11e6ae5a98e25765f2fb66baf80fc5c
2014-01-09 14:02:52 -06:00
Nate Jensen
7b17f4eabf
Merge "Issue #2563 added user server add/remove functionality" into development
...
Former-commit-id: c2a2a657bff7adb31fc57d0fc330556fdf4361f87d0fc330556fdf4361f80351c26443aeffb73883
2014-01-09 13:44:24 -06:00
Brian Clements
9a28a4e067
Issue #2563 added user server add/remove functionality
...
now persists user entered servers to localization
Former-commit-id: 7279fbf6b3af9292ea71487aa58778c8cfc788f3487aa58778c8cfc788f30c5b0eaf69a8f746f794
2014-01-09 13:19:59 -06:00
Mike Duff
2a94a50ec8
Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible.
...
Former-commit-id: 41ac6a70dde4f56affd316a8f16ee49b5adfaba216a8f16ee49b5adfaba27a1712acd6d2f74b6238
2014-01-09 13:02:08 -06:00
Max Schenkelberg
4085a38f94
Issue #2680 Fixed various OpenGL errors
...
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
Former-commit-id: 037cd48c625d488d27b983c600ada9f4765d157783c600ada9f4765d1577e4de3defecf10dcc6de3
2014-01-09 11:26:19 -06:00
Mike Duff
f6d58f7615
Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
...
Former-commit-id: 99d7e5145630b65a4fe7183ca614dfa264cb06a1183ca614dfa264cb06a14620b69f0805b6508299
2014-01-09 10:29:21 -06:00
Mike Duff
ff76fa081c
Issue #2643 - Fixed the mouse checking on DD maps
...
Former-commit-id: 3d962a54257b8964d9b24fe2dc76af56499a77c34fe2dc76af56499a77c309c5f293951c3b700563
2014-01-09 10:18:34 -06:00
Mike Duff
1c60e6e7cc
Issue #2642 - Make shared sub deletions remove the site from the list
...
Former-commit-id: 77208523470cb61d4d506cff7aaf0c4e6b4eaa4c6cff7aaf0c4e6b4eaa4cfdef5e97e20e081e8ee2
2014-01-09 10:15:48 -06:00
Ben Steffensmeier
ecaea29201
Issue #2648 Hprof analysis utility.
...
Change-Id: Ib450c48a88e8a485a2461e1f4a5c81e1be4fee68
Former-commit-id: b64ac87d9c51a7dfb438de58f318cb30ac7d37a5de58f318cb30ac7d37a53f7a5c135f76561f48b8
2014-01-08 16:47:03 -06:00
Ron Anderson
b37209e9f5
Merge "Issue #2657 : Update convertCDL2XML for unified grid." into omaha_14.2.1
...
Former-commit-id: 5d56dfe4f5be370fe7d66febe84651ad824dcf9f6febe84651ad824dcf9f7163de49e5dd2e82a135
2014-01-08 15:02:26 -06:00
Richard Peter
a1121ab34b
Merge "Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception thrown from run. Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation when the db value status was updated. Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit. Updates to hibernate.cfg.xml for Richard." into omaha_14.2.1
...
Former-commit-id: e0388d76cfb0479dfdc65f65479ba15fa03e73525f65479ba15fa03e7352029bbb8fc2f06b4aba13
2014-01-08 14:30:38 -06:00
Nate Jensen
a8b46a337f
Merge "Issue #2359 change some log statements to debug" into omaha_14.2.1
...
Former-commit-id: fc3a61518d6585b79144415c5f224a9a5630f5bb415c5f224a9a5630f5bb56d932ee567dcae0a1be
2014-01-08 13:56:54 -06:00
Brad Gonzales
ad3da98af6
Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
...
thrown from run. Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated. Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.
Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617
Former-commit-id: c05358aac502910c2a8c07a442059612860c79f907a442059612860c79f9be6f12e9c25c85734e02
2014-01-08 13:37:17 -06:00
Nate Jensen
5168eefb50
Merge "Issue #2581 fix yet another LSR decoding error" into omaha_14.2.1
...
Former-commit-id: 136cfae0a55bd0aa68d9ee3c118cb0ce24723a68ee3c118cb0ce24723a68f47773c451b273eb58a6
2014-01-08 11:30:05 -06:00
David Gillingham
0012cf9134
Issue #2657 : Update convertCDL2XML for unified grid.
...
Former-commit-id: 4925478a0b476fcb7980ed22a86d9fd6397522c4ed22a86d9fd6397522c4777c1fba863e0ef451a1
2014-01-08 11:02:30 -06:00
Nate Jensen
945671fdc4
Issue #2581 fix yet another LSR decoding error
...
Change-Id: I74e6d8c3d5c6bf71ebbc3fe32ea93ea688c6bcb5
Former-commit-id: df3778f7c679c97921483ac67a743f968e51040d3ac67a743f968e51040d79836008d759fc27dafb
2014-01-08 08:56:02 -06:00
Ron Anderson
9aae54c713
Issue #2509 Fix merge error in iscMosaic (fix indentation)
...
Change-Id: I1745af1a51d6fffe221168cc8dca217d2f309007
Former-commit-id: 167ef0a302b0fa3c65144da9799eaf82d32777854da9799eaf82d32777854fe580f47b89c27cc683
2014-01-08 08:49:32 -06:00
Nate Jensen
8356b85925
Issue #2359 change some log statements to debug
...
Change-Id: Ie549917b36268d3f5983f3946701418e7e3b5163
Former-commit-id: 77a8e7f321b3d6ba3bc9bfa6c60c66cb52747de2bfa6c60c66cb52747de2ded9b32ea1d477169f0d
2014-01-07 17:53:43 -06:00
Richard Peter
58f8909add
Merge "Issue #2658 Changes to ACARSPersistObs to ignore cutoff time when allowing archive." into omaha_14.2.1
...
Former-commit-id: 1172e81e6b0a16411de49c0d63d84197bde8138d9c0d63d84197bde8138db899a0591f4bebf53fda
2014-01-07 15:40:04 -06:00
Roger Ferrel
fa58e987d3
Issue #2658 Changes to ACARSPersistObs to ignore cutoff time when allowing archive.
...
Change-Id: I63d6f21ca9fe35b806b321677382460c762c4907
Former-commit-id: 009dfef718b49329067a4102c38bc63528dc0eb04102c38bc63528dc0eb044af3ecf0a0e559a5a66
2014-01-07 14:54:41 -06:00
Nate Jensen
02a60c86ff
Merge "Issue #2563 fixed room id creation" into development
...
Former-commit-id: 701efd5de9537dc6c8cccbad156c05a8e9db0ddecbad156c05a8e9db0dde5beb950218432a89c0fc
2014-01-07 13:50:41 -06:00
Nate Jensen
60cad7b8c0
Issue #2359 minor request JVM startup safety
...
Change-Id: I17a5f3217ac5a2f2d53660bdb45a6009c8f27004
Former-commit-id: 13ec91c615459771f66d24560cf307f83a47365324560cf307f83a473653ccfb2504cbf1e731e857
2014-01-07 13:25:45 -06:00
Brian Clements
e7602389b6
Issue #2563 fixed room id creation
...
room ids were being generated with the hostname used to connect to the server
they needed to be generated with what the server calls itself
Former-commit-id: 40763433f0a78b1d96af82716fa14766df912a4e82716fa14766df912a4e649483d3fd12c7371565
2014-01-07 13:04:24 -06:00
Nate Jensen
15c555bd0e
Merge "Issue #2563 fixed default xmpp port" into development
...
Former-commit-id: 2de703f6e826f37a2fd492e1df885687876790f892e1df885687876790f8365c11c9db527e0197be
2014-01-07 12:39:46 -06:00
Nate Jensen
7371990c29
Issue #2359 prevent obnoxious ncep decoder null pointer exceptions
...
Change-Id: I731614a8a6c9ec38bb6c1b29c4d9f6ca5a7c03d7
Former-commit-id: 79e387fc9452293fd1542c0e3f05cae509a2883f2c0e3f05cae509a2883f488956a259de5d7565e2
2014-01-07 12:38:49 -06:00
Nate Jensen
4b0667223f
Merge "Issue #2563 added packet extension to openfire plugin" into development
...
Former-commit-id: b51f9e1463a60bbdc6475846b324f3dae995730e5846b324f3dae995730eff62284a752ae6fdba34
2014-01-07 11:17:04 -06:00
Brian Clements
0193a9db0f
Issue #2563 fixed default xmpp port
...
The default port for postgres was there by mistake
Former-commit-id: ea63496cc3e08c5ea04ce263cdb63adfcf6e9adee263cdb63adfcf6e9ade27b4ec6df6373feec7f5
2014-01-07 10:52:50 -06:00
