Skip to content

Commit 7d51801

Browse files
author
Arto Kinnunen
committed
Squashed 'features/frameworks/nanostack-libservice/' changes from 260d80f42d..c343e4e2cc
c343e4e2cc Merge pull request ARMmbed#99 from PelionIoT/remove_ns_trace 70c411b0f8 Remove ns_trace.h 60e99d2c02 Update copyright (ARMmbed#100) git-subtree-dir: features/frameworks/nanostack-libservice git-subtree-split: c343e4e2ccb1517881ac85140974f3eb8cd85d46
1 parent 6b10857 commit 7d51801

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+291
-284
lines changed

‎mbed-client-libservice/common_functions.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2018, 2020, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

‎mbed-client-libservice/ip4string.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2018 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2018, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

‎mbed-client-libservice/ip6string.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2016, 2018, 2020, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

‎mbed-client-libservice/ip_fsc.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2015, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

‎mbed-client-libservice/ns_list.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2016, 2018-2020, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

‎mbed-client-libservice/ns_nvm_helper.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2016-2017 ARM Limited. All rights reserved.
2+
* Copyright (c) 2016-2017, 2021, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

‎mbed-client-libservice/ns_trace.h‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎mbed-client-libservice/ns_types.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2015 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2016, 2018-2020, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

‎mbed-client-libservice/nsdynmemLIB.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2014-2019 ARM Limited. All rights reserved.
2+
* Copyright (c) 2014-2020, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

‎mbed-client-libservice/nsdynmem_tracker.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/*
2-
* Copyright (c) 2020 ARM Limited. All rights reserved.
2+
* Copyright (c) 2020, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
4-
* Licensed under the Apache License, Version 2.0 (the License); you may
5-
* not use this file except in compliance with the License.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
67
* You may obtain a copy of the License at
78
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* http://www.apache.org/licenses/LICENSE-2.0
910
*
1011
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1314
* See the License for the specific language governing permissions and
1415
* limitations under the License.
1516
*/

0 commit comments

Comments
 (0)