Commit graph

5127 commits

Author SHA1 Message Date
Nate Jensen
70035635ec Merge "Issue #2620 Reordered developer feature.xml to match p2-build.xml" into development
Former-commit-id: 10b6341adb [formerly 02f7b23f72] [formerly aba4acf355] [formerly bd44fec4eb [formerly aba4acf355 [formerly 2c9ce82cec838ac27153cfa1227b7bf787c1964b]]]
Former-commit-id: bd44fec4eb
Former-commit-id: 6ab8eb314426f4b3bc9fdde253d7d7e3cb7267d7 [formerly 708c77878f]
Former-commit-id: 4b9411854e
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: c6f92e9207 [formerly 2a1f84b72d] [formerly 92b404f6ec] [formerly 9e817de4a9 [formerly 92b404f6ec [formerly 605f5a0a496deeb9be0e3aed1a56f6ac816038b4]]]
Former-commit-id: 9e817de4a9
Former-commit-id: 7d5d1b7a0fc09fb10c44af68831e25eff4f1f078 [formerly fc3dec0591]
Former-commit-id: 850ee18fd4
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: 2c0c6fbcc7 [formerly 8eeb3dc412] [formerly 4537513df7] [formerly 343a2495e5 [formerly 4537513df7 [formerly 33a3dead503276926af71d7355f87242f5250e54]]]
Former-commit-id: 343a2495e5
Former-commit-id: 1b6fea4b1e1ad9152e19bb26118b1df57cd9ade0 [formerly 4049af9630]
Former-commit-id: f57529be9b
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: 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 7bbefddcc1 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]
Former-commit-id: e6d7acb609
Former-commit-id: 08b064f5627b0585a3df75b960a722fde7817d6f [formerly 527408ddd4]
Former-commit-id: 5b687c7bd5
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: 36feeef940 [formerly 9e0827e8b0] [formerly 7976713662] [formerly e841723f1c [formerly 7976713662 [formerly dd2716d0f2541d300a81edcdb604bdb151cecb40]]]
Former-commit-id: e841723f1c
Former-commit-id: af136cfa606ce56f14f973561d55be09fe06ffaf [formerly f3c30e7369]
Former-commit-id: 1d4a0ae816
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: 550b40a4bf [formerly 60f22e2d4c] [formerly 48184fe695] [formerly 51c8919ea7 [formerly 48184fe695 [formerly 974e2fb98c17fe843025346954d727fb9d72a408]]]
Former-commit-id: 51c8919ea7
Former-commit-id: dc61c2e1e5f79882b6b9ca4a2f583310cd1d52df [formerly cf2c9c530c]
Former-commit-id: b15476b43e
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: 3d4ee9f0a3 [formerly 44f02d072e] [formerly 2580f289e9] [formerly 757e8d2c4b [formerly 2580f289e9 [formerly 362e90dcf918893137cd8fe0eaddd1fcbfb86538]]]
Former-commit-id: 757e8d2c4b
Former-commit-id: 7f8dc6b05899865dc8e1d89db9988cd53d0705f6 [formerly b1a2d3183f]
Former-commit-id: 9cfb816557
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: 41354cddf7 [formerly 7cae1b981d] [formerly 89f07fe932] [formerly 1c520b8cd1 [formerly 89f07fe932 [formerly 3f9f254229066cfe12501aacd14e68937764fadb]]]
Former-commit-id: 1c520b8cd1
Former-commit-id: 0a9b4434bf29a1eed5671f4ab66b9040010b48e6 [formerly bbac6df77d]
Former-commit-id: 9df631248d
2014-01-10 15:01:10 -06:00
Brian Clements
42e259b83c Issue #2594 made heap status monitor default on launch
Former-commit-id: 3333d3b926 [formerly 4f37164fc5] [formerly 6ba1eb0edb] [formerly 4a62eb90dc [formerly 6ba1eb0edb [formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]
Former-commit-id: 4a62eb90dc
Former-commit-id: 0c8dc064b7186b1457f6e9bd47835cc2ba812b79 [formerly 3d196a00dd]
Former-commit-id: cde78c4006
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: dacdddf403 [formerly 90a2c83c8e] [formerly b8a33ecdf8] [formerly 41b081307c [formerly b8a33ecdf8 [formerly dded4c12d27baede94b789d288d6bcb39e777f9f]]]
Former-commit-id: 41b081307c
Former-commit-id: 093ac09bf206a0017a0e5d3a730bba837dde43a2 [formerly a35a46de1b]
Former-commit-id: 76965c12dd
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: 4e479cf9bd [formerly 17ed8a6e75] [formerly 3017260991] [formerly d80ce4a19e [formerly 3017260991 [formerly 142f68c426c4e2fbeb1e0b97cbb7b47c38e3b90d]]]
Former-commit-id: d80ce4a19e
Former-commit-id: aa04179c7e3f5387a4ead15786aaad0bb4f86872 [formerly 57d3503ed6]
Former-commit-id: d70701cc6e
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: 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 744d7367dc [formerly b50ea7b162 [formerly 12500574ade0eced65454ff981b83f8f729cd125]]]
Former-commit-id: 744d7367dc
Former-commit-id: bbcc98303dcc89e98466e092b86268e5c8a053c9 [formerly 0e5332e8cd]
Former-commit-id: 3274c591bf
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: 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 69ca0dd0d2 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]
Former-commit-id: 7081c26823
Former-commit-id: e5367b16239e543229d0aace6c8f70b5970faf5e [formerly 17d19cc0bb]
Former-commit-id: b616f34af2
2014-01-10 12:05:30 -06:00
Nate Jensen
fa5ed0fd00 Merge "Issue #2647 Fix window focus problems." into development
Former-commit-id: ad445b75d8 [formerly 95181d092e] [formerly 5e1dfbf0f8] [formerly 2a06693b3e [formerly 5e1dfbf0f8 [formerly 3d586d2e95877c79bdaa88080d920ce12c1dd5c4]]]
Former-commit-id: 2a06693b3e
Former-commit-id: 03520500b72bdf17a7494ab141345e3c52581f59 [formerly 7ad41f6958]
Former-commit-id: d41877f6fe
2014-01-10 11:14:53 -06:00
Mike Duff
5f19ccc46e Issue #2642 - Update header comment
Former-commit-id: b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly 28114764a5 [formerly 101d9939d6 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]
Former-commit-id: 28114764a5
Former-commit-id: 32bb19308f502de6a22ca9009876c463c872be8c [formerly 7d25b33cb6]
Former-commit-id: 12c47ea375
2014-01-10 10:57:18 -06:00
Mike Duff
ae88e49e26 Issue #2636 - change log statements, add missing copyright headers
Former-commit-id: 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 3be3a8ac0d [formerly 12a8618c42 [formerly 8bf5a8185c09e9d368afc8e8e7409222164159aa]]]
Former-commit-id: 3be3a8ac0d
Former-commit-id: 7b4e8fc0dd59dffc07172aea3397179483206f25 [formerly e121eb5dbd]
Former-commit-id: ea07460e3e
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: a3495d01dc [formerly 13172879fd] [formerly ae7eb39380] [formerly 73c022da20 [formerly ae7eb39380 [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]
Former-commit-id: 73c022da20
Former-commit-id: 5235d6c097888869951204c434aba9265b112a4a [formerly 8abc1ec611]
Former-commit-id: 59586b673b
2014-01-10 10:39:07 -06:00
Nate Jensen
1139a316ae Merge "Issue #1998 fixed NPE in PointDataPluginDao" into development
Former-commit-id: 94c3370833 [formerly 41a20fbd00] [formerly 38e5666f5ac543f5b8691b09d3a9e3a64c094554 [formerly 21114964fa]] [formerly 32909203d0 [formerly 21114964fa [formerly a04a5427256f18725d85da15497d9637419c885c]]]
Former-commit-id: 32909203d0
Former-commit-id: eaaa27b717eeb61eb62f9c1341817fd9cb2b495e [formerly 30d01ec8ba]
Former-commit-id: 9e696b1257
2014-01-10 08:58:03 -06:00
Nate Jensen
e63bac199d Issue #2359 log exceptions in FFTI processing
Change-Id: Iec1c743352187de071f4b9840f1672bff531ba94

Former-commit-id: 8a469f686a [formerly 1d9229a4a6] [formerly d289eb1b55] [formerly 43b75928e4 [formerly d289eb1b55 [formerly 2abd0cc65b6fe98dc95e11b5b8d53a325c0f2074]]]
Former-commit-id: 43b75928e4
Former-commit-id: 46539e0877f8c37fe79c6bcc26836d7cf6855c9f [formerly daba59930d]
Former-commit-id: 8b5ce7c07f
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: 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 52850fe95a [formerly 8ca1217f03 [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]
Former-commit-id: 52850fe95a
Former-commit-id: 766dc3d39c99f73f010de1c29095aef2b852645e [formerly 690f1b15dd]
Former-commit-id: b833c4333c
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: 6227cb9e3c [formerly c32d55f3fc] [formerly 36ed029f0a] [formerly 0f3175bd77 [formerly 36ed029f0a [formerly b53137d1af67ff95a91b4bf4d2aa78ef4c43b80a]]]
Former-commit-id: 0f3175bd77
Former-commit-id: 3d87934664370f4c41ebd107b46989b9bcbb1cff [formerly c95d310568]
Former-commit-id: 78313bec85
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: a39f2bff20 [formerly 0bd52b65e7] [formerly b711c35c68] [formerly f45a281935 [formerly b711c35c68 [formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]
Former-commit-id: f45a281935
Former-commit-id: 8e88f0da68170bd6d7f37b03b43ebe72c7b0e3e4 [formerly 0459cd237e]
Former-commit-id: f4108b8be2
2014-01-09 16:53:52 -06:00
Ben Steffensmeier
05ebc3eece Issue #2647 Fix window focus problems.
Former-commit-id: eebab1d33f [formerly 13da8899de] [formerly 206754a3f8eac1e2ede760acafef51f7d6fa12a4 [formerly 2b9e9a41db]] [formerly 488d5e45b1 [formerly 2b9e9a41db [formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]]]
Former-commit-id: 488d5e45b1
Former-commit-id: 7b56714a7309f567fe16d1c7a70ee9741297c5dc [formerly 0ada0c6d3f]
Former-commit-id: 1aa018e5b7
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: 9686c8fab1 [formerly f0c1b109f8] [formerly 401cd813f1] [formerly 1e6ae5a98e [formerly 401cd813f1 [formerly 82736d581767831f426a17b0ee9d264fdda7dd64]]]
Former-commit-id: 1e6ae5a98e
Former-commit-id: 94475c71324a05087908449a3190bdfa39879b6a [formerly 25765f2fb6]
Former-commit-id: 6baf80fc5c
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: c2a2a657bf [formerly f7adb31fc5] [formerly 7d0fc33055] [formerly 6fdf4361f8 [formerly 7d0fc33055 [formerly f343c7bc294f4c89c4ac75630910f153e61d24a3]]]
Former-commit-id: 6fdf4361f8
Former-commit-id: 9b4895ed93f0a2ae2e0b94f8d502c98a45ed7a60 [formerly 0351c26443]
Former-commit-id: aeffb73883
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: 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly c8cfc788f3 [formerly 487aa58778 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]
Former-commit-id: c8cfc788f3
Former-commit-id: a779f96749690d34c737ced63e146304783cc395 [formerly 0c5b0eaf69]
Former-commit-id: a8f746f794
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: 41ac6a70dd [formerly e4f56affd3] [formerly 16a8f16ee4] [formerly 9b5adfaba2 [formerly 16a8f16ee4 [formerly 87dd0df07a9ef0e7881ed0cf7b8aa1d41f0c9d4d]]]
Former-commit-id: 9b5adfaba2
Former-commit-id: c5a413c1f93f4b03121d44e01630e558a6904c48 [formerly 7a1712acd6]
Former-commit-id: d2f74b6238
2014-01-09 13:02:08 -06:00
Max Schenkelberg
4085a38f94 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b

Former-commit-id: 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly f4765d1577 [formerly 83c600ada9 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]
Former-commit-id: f4765d1577
Former-commit-id: 078c53e38b0dfbb2d2f1efc3df9341d3b037960b [formerly e4de3defec]
Former-commit-id: f10dcc6de3
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: 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly a264cb06a1 [formerly 183ca614df [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]
Former-commit-id: a264cb06a1
Former-commit-id: 1723170c25ee5bf976e58a1096d080a768d79925 [formerly 4620b69f08]
Former-commit-id: 05b6508299
2014-01-09 10:29:21 -06:00
Mike Duff
ff76fa081c Issue #2643 - Fixed the mouse checking on DD maps
Former-commit-id: 3d962a5425 [formerly 7b8964d9b2] [formerly 4fe2dc76af] [formerly 56499a77c3 [formerly 4fe2dc76af [formerly 775e99924e098387e4ca5042823ef20d1a0d2afe]]]
Former-commit-id: 56499a77c3
Former-commit-id: 276825c6d8c7a85fe6b1be0854404a47fc47b5c8 [formerly 09c5f29395]
Former-commit-id: 1c3b700563
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: 7720852347 [formerly 0cb61d4d50] [formerly 6cff7aaf0c] [formerly 4e6b4eaa4c [formerly 6cff7aaf0c [formerly a8f57c338a8a06c6d40842f56c329fd9f215bc5b]]]
Former-commit-id: 4e6b4eaa4c
Former-commit-id: 87757eade8f87fee23058c260317eed10f66609c [formerly fdef5e97e2]
Former-commit-id: 0e081e8ee2
2014-01-09 10:15:48 -06:00
Ben Steffensmeier
ecaea29201 Issue #2648 Hprof analysis utility.
Change-Id: Ib450c48a88e8a485a2461e1f4a5c81e1be4fee68

Former-commit-id: b64ac87d9c [formerly 51a7dfb438] [formerly de58f318cb] [formerly 30ac7d37a5 [formerly de58f318cb [formerly 1bfc1a31ed9052795e1ab0e83cd4bede3eb8e17c]]]
Former-commit-id: 30ac7d37a5
Former-commit-id: 4a73f7b07a78c95dd7db67c94ba1568ce519628c [formerly 3f7a5c135f]
Former-commit-id: 76561f48b8
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: 5d56dfe4f5 [formerly be370fe7d6] [formerly 6febe84651] [formerly ad824dcf9f [formerly 6febe84651 [formerly 7fcc9e660049074c4c1e6a918d371182b40278ba]]]
Former-commit-id: ad824dcf9f
Former-commit-id: d21b6ac36f41e5c6e6bfcb3175698aad829f2392 [formerly 7163de49e5]
Former-commit-id: dd2e82a135
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: e0388d76cf [formerly b0479dfdc6] [formerly 5f65479ba1] [formerly 5fa03e7352 [formerly 5f65479ba1 [formerly 3cd86c518839710768c9a0552749fa96f936f2c4]]]
Former-commit-id: 5fa03e7352
Former-commit-id: c7dcc03215c8979da68de0120dfaad26214e39c3 [formerly 029bbb8fc2]
Former-commit-id: f06b4aba13
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: fc3a61518d [formerly 6585b79144] [formerly 415c5f224a] [formerly 9a5630f5bb [formerly 415c5f224a [formerly b226f3ebfd3932d51d38982ae5c13364aaec2f5b]]]
Former-commit-id: 9a5630f5bb
Former-commit-id: 496fb0eb9e6f5c0a409f8534dd512391066ea75f [formerly 56d932ee56]
Former-commit-id: 7dcae0a1be
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: c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly 12860c79f9 [formerly 07a4420596 [formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]]]
Former-commit-id: 12860c79f9
Former-commit-id: 53dd09e9f01677738d8bb7bceaf559f45f59115c [formerly be6f12e9c2]
Former-commit-id: 5c85734e02
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: 136cfae0a5 [formerly 5bd0aa68d9] [formerly ee3c118cb0] [formerly ce24723a68 [formerly ee3c118cb0 [formerly b025f9ff3b1ecbe485418b3d19312777f5af8775]]]
Former-commit-id: ce24723a68
Former-commit-id: 85e94dd1992438356a7a3f1afa2711bb313caf35 [formerly f47773c451]
Former-commit-id: b273eb58a6
2014-01-08 11:30:05 -06:00
David Gillingham
0012cf9134 Issue #2657: Update convertCDL2XML for unified grid.
Former-commit-id: 4925478a0b [formerly 476fcb7980] [formerly ed22a86d9f] [formerly d6397522c4 [formerly ed22a86d9f [formerly 247536f4d83c7f7de449707916d2950ae74be551]]]
Former-commit-id: d6397522c4
Former-commit-id: cf78b85e4b8682c0ad54f461f0024241114e38bb [formerly 777c1fba86]
Former-commit-id: 3e0ef451a1
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: df3778f7c6 [formerly 79c9792148] [formerly 3ac67a743f] [formerly 968e51040d [formerly 3ac67a743f [formerly 3f2c97439a1dbbbc94285343b3b558dead63a0f6]]]
Former-commit-id: 968e51040d
Former-commit-id: 171f2bf5c41ccd55e091d92fc423bb389db59ba0 [formerly 79836008d7]
Former-commit-id: 59fc27dafb
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: 167ef0a302 [formerly b0fa3c6514] [formerly 4da9799eaf] [formerly 82d3277785 [formerly 4da9799eaf [formerly 94c97fee9c6925ac9e73530bd18ec03d8cab4a40]]]
Former-commit-id: 82d3277785
Former-commit-id: 400aac7d966ddfd5fb28ad35617d4abd86685c39 [formerly 4fe580f47b]
Former-commit-id: 89c27cc683
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: 77a8e7f321 [formerly b3d6ba3bc9] [formerly bfa6c60c66] [formerly cb52747de2 [formerly bfa6c60c66 [formerly 146a9cca0ffa68f44068c620a3fa693c46db9031]]]
Former-commit-id: cb52747de2
Former-commit-id: 66c48114fb9f6bf3d321abdbd200ebd96ea88c1c [formerly ded9b32ea1]
Former-commit-id: d477169f0d
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: 1172e81e6b [formerly 0a16411de4] [formerly 9c0d63d841] [formerly 97bde8138d [formerly 9c0d63d841 [formerly e6b1f12dd3a36b76e60d0e90941f94948022813a]]]
Former-commit-id: 97bde8138d
Former-commit-id: a00e1d1aa39cae3b5045f2790d4e5adb9b27eb8c [formerly b899a0591f]
Former-commit-id: 4bebf53fda
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: 009dfef718 [formerly b49329067a] [formerly 4102c38bc6] [formerly 3528dc0eb0 [formerly 4102c38bc6 [formerly fb4e61235f1bf65a4b3337514277dcbca2d82f8d]]]
Former-commit-id: 3528dc0eb0
Former-commit-id: 61073c6a17a58ea7802e97eaf58765a320412205 [formerly 44af3ecf0a]
Former-commit-id: 0e559a5a66
2014-01-07 14:54:41 -06:00
Nate Jensen
02a60c86ff Merge "Issue #2563 fixed room id creation" into development
Former-commit-id: 701efd5de9 [formerly 537dc6c8cc] [formerly f1533b069a94fcd70602fe9d0d8551219afef11e [formerly cbad156c05]] [formerly a8e9db0dde [formerly cbad156c05 [formerly a5d7f0a46a5304defe6ebde0b73418c0da168437]]]
Former-commit-id: a8e9db0dde
Former-commit-id: 1b9b5174b8f31578073feb91a2f11b6ec67ff985 [formerly 5beb950218]
Former-commit-id: 432a89c0fc
2014-01-07 13:50:41 -06:00
Nate Jensen
60cad7b8c0 Issue #2359 minor request JVM startup safety
Change-Id: I17a5f3217ac5a2f2d53660bdb45a6009c8f27004

Former-commit-id: 13ec91c615 [formerly 459771f66d] [formerly 24560cf307] [formerly f83a473653 [formerly 24560cf307 [formerly 3916523cd702e367a6d66743b0517872475a0c36]]]
Former-commit-id: f83a473653
Former-commit-id: e65449cb58c98692037c345dad76b1e4316ed7ad [formerly ccfb2504cb]
Former-commit-id: f1e731e857
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: 40763433f0 [formerly a78b1d96af] [formerly 82716fa147] [formerly 66df912a4e [formerly 82716fa147 [formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]]
Former-commit-id: 66df912a4e
Former-commit-id: ce480f2f3d00e3ac778f4d35236875333682e387 [formerly 649483d3fd]
Former-commit-id: 12c7371565
2014-01-07 13:04:24 -06:00
Nate Jensen
15c555bd0e Merge "Issue #2563 fixed default xmpp port" into development
Former-commit-id: 2de703f6e8 [formerly 26f37a2fd4] [formerly 92e1df8856] [formerly 87876790f8 [formerly 92e1df8856 [formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]]
Former-commit-id: 87876790f8
Former-commit-id: 7d4ac4c2b24db7918d4a19a0abd00db4ed4b6787 [formerly 365c11c9db]
Former-commit-id: 527e0197be
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: 79e387fc94 [formerly 52293fd154] [formerly 2c0e3f05ca] [formerly e509a2883f [formerly 2c0e3f05ca [formerly 514d0cfecd3eb8c81a6d2120406225856d964c9e]]]
Former-commit-id: e509a2883f
Former-commit-id: d150fe75866671138e7bd888dc3ce56b60f9a3c4 [formerly 488956a259]
Former-commit-id: de5d7565e2
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: b51f9e1463 [formerly a60bbdc647] [formerly 5846b324f3] [formerly dae995730e [formerly 5846b324f3 [formerly 343de55a9a845657304d72779ee1d4aec46ed678]]]
Former-commit-id: dae995730e
Former-commit-id: b30c0c15075b76b5f0ab9708182cf858788d2926 [formerly ff62284a75]
Former-commit-id: 2ae6fdba34
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: ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly dfcf6e9ade [formerly e263cdb63a [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 44850ca1b4681434bdd6bef977c019dc3e5fc792 [formerly 27b4ec6df6]
Former-commit-id: 373feec7f5
2014-01-07 10:52:50 -06:00