Commit graph

15 commits

Author SHA1 Message Date
Nate Jensen
28535058f9 Merge "Issue #1534 Check for null in initInternal to avoid exception" into 13.2.1_delivery
Former-commit-id: 8d07de6933 [formerly a0856d2f26] [formerly ca2d99c69a [formerly a89274c821276c8a5ef3b08a8c25aa03c391b766]]
Former-commit-id: ca2d99c69a
Former-commit-id: 1fa3c9cb3c
2013-01-30 15:02:45 -06:00
Max Schenkelberg
50deaaaa79 Issue #1534 Check for null in initInternal to avoid exception
Change-Id: I9ccf341c3c04f08f88e5366009771f9cda510119

Former-commit-id: a574e13562 [formerly 5ed30a723e] [formerly 23e3ad2382 [formerly 77d0d92f23325407292c5a048ba1276e7e0568ad]]
Former-commit-id: 23e3ad2382
Former-commit-id: 296186190a
2013-01-30 11:34:19 -06:00
Steve Harris
fbbf2f3cda Issue #1542 throw out non-watches in watches resource
Former-commit-id: b651007bc7 [formerly 2f5d5f08ae] [formerly 97bd112438 [formerly e719c4112920802a7457ced7836a1c4a42140400]]
Former-commit-id: 97bd112438
Former-commit-id: 50565fee11
2013-01-30 11:26:20 -06:00
Matt Nash
3f76c7ab62 Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension
Change-Id: I6cc0d8eb6079efc224136b67962903b75330c8e1

Former-commit-id: 9d35cdf724 [formerly c992d831af] [formerly 3ff52fb9ff [formerly 8e1660c65bbb6ad76bdc44c3327819170c3244f5]]
Former-commit-id: 3ff52fb9ff
Former-commit-id: 7d5f78c785
2012-12-13 13:00:09 -06:00
Jonathan Sanchez
0037b2b7f6 Issue #1149 Refactored watches and warnings.
Former-commit-id: d0ce171ca5 [formerly b19f4810e2] [formerly e859dd05e9 [formerly 3e4148ce433d9f8810f383f56c8ca9b24802de93]]
Former-commit-id: e859dd05e9
Former-commit-id: 81853ab4ab
2012-10-01 12:19:32 -05:00
root
537dbadf64 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
2012-08-15 22:15:20 +00:00
Jonathan Sanchez
3952dfc7ac Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.


Former-commit-id: 4f2d6630c1 [formerly 6507a97665] [formerly fa7795d17f [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]
Former-commit-id: fa7795d17f
Former-commit-id: 7ad6329fe0
2012-08-09 08:26:21 -05:00
Steve Harris
333fd9c64e Revert "12.6.1-10 baseline"
This reverts commit f8497470fc [formerly b33c5bdfcf] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].


Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
2012-06-21 08:51:08 -05:00
Steve Harris
f8497470fc 12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
2012-06-21 08:38:48 -05:00
Steve Harris
b69fa75919 12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
2012-06-11 16:23:47 -05:00
Steve Harris
4792884ab2 12.5.1-6 baseline
Former-commit-id: df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: fa87dc6cf1
Former-commit-id: c452cce633
2012-05-16 16:41:22 -05:00
Steve Harris
97caaa0327 12.4.1-10 baseline
Former-commit-id: 418489e726 [formerly 704b75e1a1] [formerly 01457fbbde [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 01457fbbde
Former-commit-id: aabc3842ac
2012-04-24 15:38:29 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Matt Nash
82300ccdcf Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
8e80217e59 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00