Skip to content

Merge upstream#59

Merged
DaikiMaekawa merged 151 commits intoalpine-custom-apkfrom
merge-upstream
Jan 29, 2021
Merged

Merge upstream#59
DaikiMaekawa merged 151 commits intoalpine-custom-apkfrom
merge-upstream

Conversation

@DaikiMaekawa
Copy link
Copy Markdown
Member

@DaikiMaekawa DaikiMaekawa commented Jan 29, 2021

No description provided.

Timple and others added 30 commits January 19, 2021 08:57
@Timple
rviz_satellite: 3.0.3-1 in 'melodic/distribution.yaml' [bloom] (ros#2…
eee114c 
…8039)
@mikeferguson
update branch name for moveit_python (melodic) (ros#28026)
a3f3125
@Timple
rviz_satellite: 3.0.3-1 in 'melodic/distribution.yaml' [bloom] (ros#2…
b72cc70 
…8039)
@hadiTab
ros2-lgsvl-bridge: 0.3.0-1 in 'dashing/distribution.yaml' [bloom] (ro…
f9a3ae9 
…s#28037)
@flixr
rc_genicam_driver: 0.1.1-1 in 'foxy/distribution.yaml' [bloom] (ros#2…
8592cfa 
…8035)
@mikeferguson
moveit_python: 0.4.0-1 in 'noetic/distribution.yaml' [bloom] (ros#28033)
9df6de0
@PeterMitrano
cnpy: 0.0.6-1 in 'noetic/distribution.yaml' [bloom] (ros#28032)
ccda0d4 
Co-authored-by: Peter Mitrano <pmitrano@armstorm>
@wxmerkt
octomap_rviz_plugins: 0.2.3-1 in 'noetic/distribution.yaml' [bloom] (r…
b2a09de 
…os#28031)
@fmessmer
cob_android: 0.1.9-1 in 'noetic/distribution.yaml' [bloom] (ros#28030)
bbcfda1
@fmessmer
cob_android: 0.1.9-1 in 'kinetic/distribution.yaml' [bloom] (ros#28029)
7ee81f8
@evenator
nmea_navsat_driver: 0.6.1-2 in 'noetic/distribution.yaml' [bloom] (ro…
bf6cd62 
…s#28028)
@mikeferguson
update branch name for moveit_python (noetic) (ros#28027)
ad9d9e8
@mikeferguson
update branch name for moveit_python (kinetic) (ros#28025)
f7681c0
@atiderko
fkie_multimaster: 1.2.6-2 in 'noetic/distribution.yaml' [bloom] (ros#…
7628fbb 
…28024)
@anqixu
ueye_cam: 1.0.19-1 in 'noetic/distribution.yaml' [bloom] (ros#28023)
52bf0e8
@flixr
rc_reason_clients: 0.2.1-1 in 'dashing/distribution.yaml' [bloom] (ro…
130d2c0 
…s#28022)
@tfoote @clalancette @jacobperron
New verbiage designating the release manager as the authority for mai…
225a90f 
…ntainership changes (ros#28000)

* New verbiage designating the release manager as the authority for

* Update REVIEW_GUIDELINES.md

Co-authored-by: Jacob Perron <jacob@openrobotics.org>

Co-authored-by: Chris Lalancette <clalancette@openrobotics.org>
Co-authored-by: Jacob Perron <jacob@openrobotics.org>
@qinyunchuan
dgps_ros: 1.0.0-4 in 'kinetic/distribution.yaml' (ros#27969)
a549d54 
* dgps_ros: 1.0.0-4 in 'kinetic/distribution.yaml' 

increasing version of dgps_ros  to 1.0.0-4, to fix the building problem
@jonbinney @sloretz
Rosdep rule for python3-sympy (ros#27881)
6cea33f 
* Rosdep rule for python3-sympy

Co-authored-by: Shane Loretz <shane.loretz@gmail.com>
@Timple
rviz_satellite: 3.0.3-1 in 'noetic/distribution.yaml' [bloom] (ros#28043
942cc21 
)
@paulbovbel
vrpn_client_ros: 0.2.2-1 in 'noetic/distribution.yaml' [bloom] (ros#2…
aaf282f 
…8042)
@flixr
rc_reason_clients: 0.2.1-1 in 'foxy/distribution.yaml' [bloom] (ros#2…
399f86a 
…8040)
@MichaelGrupp
Add libgmock-dev to Buster & Focal. (ros#27195)
e99d845
@VictorLamoine
Add moving_average (ros#28038)
612b6d1
@gbiggs
map_transformer: 1.0.0-1 in 'foxy/distribution.yaml' [bloom] (ros#28013)
2bc14a3 
* map_transformer: 1.0.0-1 in 'foxy/distribution.yaml' [bloom]
@sloretz @cottsay
Add python3-cffi rosdep key (ros#27930)
01a1439 
* Add python3-cffi rosdep key

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

* Add rhel

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

Co-authored-by: Scott K Logan <logans@cottsay.net>

Co-authored-by: Scott K Logan <logans@cottsay.net>
@MatthijsBurgh
Add castxml (ros#27964)
cfba4d9
@hocjordan
rosdep: add ansible-runner as python-ansible-runner-pip (ros#27976)
935746c 
* rosdep: add ansible-runner as python-ansible-runner-pip

* use python3- prefix
@roehling
async_web_server_cpp: 2.0.0-1 in 'rolling/distribution.yaml' [bloom] (r…
b4a66b5 
…os#27997)
@reinzor
[rosdep] python3-dbus (ros#28034)
37bedc1
facontidavide and others added 21 commits January 27, 2021 10:34
@facontidavide
behaviortree_cpp: 3.5.5-2 in 'noetic/distribution.yaml' [bloom] (ros#…
a483288 
…28145)

Co-authored-by: Davide Faconti <dfaconti@seegrid.com>
@flixr
rc_genicam_driver: 0.5.0-1 in 'kinetic/distribution.yaml' [bloom] (ro…
c3e40d8 
…s#28149)
@flixr
rc_genicam_driver: 0.5.0-1 in 'melodic/distribution.yaml' [bloom] (ro…
e2d7241 
…s#28150)
@flixr
rc_genicam_driver: 0.5.0-1 in 'noetic/distribution.yaml' [bloom] (ros…
e12d189 
…#28151)
@facontidavide
behaviotree_cpp_v3: 3.5.5-2 in 'melodic/distribution.yaml' [bloom] (r…
4f41d39 
…os#28144)

Co-authored-by: Davide Faconti <dfaconti@seegrid.com>
@BV-OpenSource @amferreiraBEV
Change Heifu branch for documentation and source (ros#28124)
54b0fa4 
* Change Heifu branch for documentation and source.

Co-authored-by: André <andre.ferreira@pdmfc.com>
Co-authored-by: amferreiraBEV <amferreira@beyond-vision.pt>
Co-authored-by: André Filipe <andre.ferreira@beyond-vision.pt>
@at-wat
neonavigation: 0.10.6-1 in 'melodic/distribution.yaml' [bloom] (ros#2…
be6709a 
…8157)
@at-wat
neonavigation: 0.10.6-1 in 'kinetic/distribution.yaml' [bloom] (ros#2…
24f776b 
…8156)
@SteveMacenski
nonpersistent_voxel_layer: 1.3.0-2 in 'noetic/distribution.yaml' [blo…
5dd3408 
…om] (ros#28159)
Update default branch for transport_drivers (ros#28154)
f7a5090
@d-nakamichi
khi_robot: 1.2.0-1 in 'melodic/distribution.yaml' [bloom] (ros#28139)
100266d
@at-wat
neonavigation: 0.10.6-1 in 'noetic/distribution.yaml' [bloom] (ros#28158
97f564e 
)
@Karsten1987
update branch for rolling PR job (ros#28161)
f5e46a5
@Timple
rx_service_tools: 1.0.2-1 in 'noetic/distribution.yaml' [bloom] (ros#…
e01d23e 
…28142)
@Karsten1987
diagnostics: 2.0.6-1 in 'foxy/distribution.yaml' [bloom] (ros#28162)
3ce4f73
@Karsten1987
diagnostics: 2.1.1-1 in 'rolling/distribution.yaml' [bloom] (ros#28163)
48333d1
@flixr
rc_genicam_camera: 1.2.3-1 in 'noetic/distribution.yaml' [bloom] (ros…
4f67b49 
…#28153)
@cottsay
Add RHEL rules for java and maven (ros#28045)
86c9a55
@cottsay
Add RHEL 7 rule for sdformat (ros#28049)
ec66cd0
@reinzor @nuclearsandwich @ivanpauno
[rosdep] python3-numpy-stl (ros#27986)
6e5af84 
* [rosdep] python3-numpy-stl
Co-authored-by: Steven! Ragnarök <nuclearsandwich@users.noreply.github.com>
Co-authored-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
@DaikiMaekawa
Merge branch 'master' of git://github.com/ros/rosdistro into merge-up…
b40eaa7 
…stream
@DaikiMaekawa DaikiMaekawa requested a review from at-wat January 29, 2021 07:29
@DaikiMaekawa
Copy link
Copy Markdown
Member Author

DaikiMaekawa commented Jan 29, 2021

@at-wat PTAL

at-wat
at-wat approved these changes Jan 29, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@at-wat at-wat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Please merge it by Create a merge commit.

@DaikiMaekawa DaikiMaekawa merged commit 9f454f8 into alpine-custom-apk Jan 29, 2021
@DaikiMaekawa DaikiMaekawa deleted the merge-upstream branch January 29, 2021 07:35
@at-wat
Copy link
Copy Markdown
Member

at-wat commented Jan 29, 2021

@DaikiMaekawa using squash merge is not good for this PR.

@DaikiMaekawa
Copy link
Copy Markdown
Member Author

DaikiMaekawa commented Jan 29, 2021

@at-wat Should I revert it back?

@at-wat
Copy link
Copy Markdown
Member

at-wat commented Jan 29, 2021

I'll force push to fix it.

@at-wat
Copy link
Copy Markdown
Member

at-wat commented Jan 29, 2021

fixed by #60

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@at-wat at-wat at-wat approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.